Fixed CacheMacro