Move Concurrentdictionary to ReflectionCacheSet.Shared.Internal.GenericTypeDefinitionByType

Author: SergeiPavlov

src/Autofac/Core/InternalReflectionCaches.cs

@@ -54,6 +54,8 @@ internal class InternalReflectionCaches
     /// </summary>
     public ReflectionCacheDictionary<Type, ConstructorInfo[]> DefaultPublicConstructors { get; }
 
+    public ReflectionCacheDictionary<Type, Type> GenericTypeDefinitionByType  { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="InternalReflectionCaches"/> class.
     /// </summary>
@@ -72,5 +74,6 @@ public InternalReflectionCaches(ReflectionCacheSet set)
         AutowiringPropertySetters = set.GetOrCreateCache<ReflectionCacheDictionary<PropertyInfo, Action<object, object?>>>(nameof(AutowiringPropertySetters));
         AutowiringInjectableProperties = set.GetOrCreateCache<ReflectionCacheDictionary<Type, IReadOnlyList<PropertyInfo>>>(nameof(AutowiringInjectableProperties));
         DefaultPublicConstructors = set.GetOrCreateCache<ReflectionCacheDictionary<Type, ConstructorInfo[]>>(nameof(DefaultPublicConstructors));
+        GenericTypeDefinitionByType = set.GetOrCreateCache<ReflectionCacheDictionary<Type, Type>>(nameof(GenericTypeDefinitionByType));
     }
 }

src/Autofac/Features/OpenGenerics/OpenGenericServiceBinder.cs

@@ -69,10 +69,7 @@ public static bool TryBindOpenGenericTypedService(
         return false;
     }
 
-    private static readonly ConcurrentDictionary<Type, Type> GenericTypeDefinitionByType = new();
-    private static readonly Func<Type, Type> GenericTypeDefinitionFactory = type => type.GetGenericTypeDefinition();
-
-    private static Type GetGenericTypeDefinition(Type type) => GenericTypeDefinitionByType.GetOrAdd(type, GenericTypeDefinitionFactory);
+    private static Type GetGenericTypeDefinition(Type type) => ReflectionCacheSet.Shared.Internal.GenericTypeDefinitionByType.GetOrAdd(type, static t => t.GetGenericTypeDefinition());
 
     /// <summary>
     /// Given a closed generic service (that is being requested), creates a regular delegate callback