Merge pull request #22844 from abpframework/auto-merge/rel-9-1/3716

Merge branch rel-9.2 with rel-9.1

Author: maliming

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDynamicClaimsPrincipalContributorCache.cs

@@ -58,9 +58,9 @@ public virtual async Task<AbpDynamicClaimCacheItem> GetAsync(Guid userId, Guid?
             return emptyCacheItem;
         }
 
-        return await DynamicClaimCache.GetOrAddAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId), async () =>
+        using (CurrentTenant.Change(tenantId))
         {
-            using (CurrentTenant.Change(tenantId))
+            return await DynamicClaimCache.GetOrAddAsync(AbpDynamicClaimCacheItem.CalculateCacheKey(userId, tenantId), async () =>
             {
                 Logger.LogDebug($"Filling dynamic claims cache for user: {userId}");
 
@@ -82,11 +82,11 @@ public virtual async Task<AbpDynamicClaimCacheItem> GetAsync(Guid userId, Guid?
                 }
 
                 return dynamicClaims;
-            }
-        }, () => new DistributedCacheEntryOptions
-        {
-            AbsoluteExpirationRelativeToNow = CacheOptions.Value.CacheAbsoluteExpiration
-        });
+            }, () => new DistributedCacheEntryOptions
+            {
+                AbsoluteExpirationRelativeToNow = CacheOptions.Value.CacheAbsoluteExpiration
+            });
+        }
     }
 
     public virtual async Task ClearAsync(Guid userId, Guid? tenantId = null)