fix CacheKey for singletons