MagicDraw 2022.x Macro Re-execution Issue with Multi-file Structure

I have a Jython macro that runs successfully the first time in MagicDraw 2022x, but subsequent executions only display "Script ran" without actually running the script. This requires closing and reopening the model to run the script again. The same script works fine with multiple executions in MagicDraw 2021x. The main script imports and uses multiple service classes from different directories for handling different block and properties creation in the model. 

Questions: Is there a behavior change in 2022x regarding macro execution caching, particularly with multi-file structures (not readily apparent in the documentation)?

The obvious answer is to build a plugin instead of a macro, but the modular script approach worked in the previous 2021 version and plugin would take significant more time that our team don't have. Any leads on this are appreciated.