Modified location of cache invalidaiton calls