Fixed cache invalidation issue