Covers non static macro calls with Cache Repository