Addressing code review
More specific cache invalidation