Added tenantkey to cache key