changes to cache key for multitenancy