Remove mocks from cache invalidation tetss