Fixed creating cache key