Updated cache key generation