Fixing issue with cache key