fix cache key generation