Refactored cache key generation.