Change cache key generation