Covers non static macro calls with Cache Repository
Adds hasMacro method and changes back to macroCall