Fixing cache key generator