Fixed cache invalidation issue;