Cache invalidation fixes