(fix) Finished cache invalidation