From 3e5d6617e505bc931bb6abd7f72816b5a2db69db Mon Sep 17 00:00:00 2001
From: Nikolay Pianikov <nikolayp@mail.ru>
Date: Sat, 23 Sep 2023 09:47:45 +0300
Subject: [PATCH] Optimization of flow-safety of object creation within the
 composition of objects

---
 .run/Pack.run.xml                             |   2 +-
 readme/ArrayDetails.md                        | 130 +++++++++---------
 readme/Console.md                             |   2 +-
 readme/ConsoleTopLevelStatements.md           |   2 +-
 readme/EnumDetails.md                         |  82 +++++------
 readme/FuncDetails.md                         |  68 ++++-----
 readme/SingletonDetails.md                    | 106 +++++++-------
 readme/TransientDetails.md                    |  98 ++++++-------
 readme/WebAPI.md                              |   2 +-
 readme/Wpf.md                                 |   2 +-
 readme/a-few-partial-classes.md               |  48 +++----
 readme/advanced-interception.md               |  48 +++----
 readme/arguments.md                           |  60 ++++----
 readme/array.md                               |  56 ++++----
 readme/auto-bindings.md                       |  48 +++----
 readme/child-composition.md                   |  72 +++++-----
 readme/complex-generics.md                    |  52 +++----
 readme/composition-roots.md                   |  78 +++++------
 readme/constructor-ordinal-attribute.md       |  52 +++----
 readme/custom-attributes.md                   |  56 ++++----
 readme/decorator.md                           |  48 +++----
 readme/default-lifetime.md                    |  72 +++++-----
 readme/dependent-compositions.md              | 112 +++++++--------
 readme/disposable-singleton.md                |  72 +++++-----
 readme/enumerable.md                          |  69 ++++------
 readme/factory.md                             |  50 +++----
 readme/field-injection.md                     |  50 +++----
 readme/func-with-arguments.md                 |  66 ++++-----
 readme/func.md                                |  69 ++++------
 readme/generics.md                            |  50 +++----
 readme/injection.md                           |  52 +++----
 readme/interception.md                        |  46 +++----
 readme/lazy.md                                |  75 +++++-----
 readme/member-ordinal-attribute.md            |  70 +++++-----
 readme/method-injection.md                    |  50 +++----
 readme/multi-contract-bindings.md             |  50 +++----
 readme/oncannotresolve-hint.md                |  50 +++----
 readme/ondependencyinjection-hint.md          |  48 +++----
 readme/onnewinstance-hint.md                  |  52 +++----
 readme/overriding-the-bcl-binding.md          |  48 +++----
 readme/partial-class.md                       |  48 +++----
 readme/perresolve.md                          |  56 ++++----
 readme/property-injection.md                  |  50 +++----
 readme/required-properties-or-fields.md       |  58 ++++----
 readme/resolve-hint.md                        |  16 +--
 readme/resolve-methods.md                     |  78 +++++------
 readme/root-arguments.md                      |  12 +-
 readme/scope.md                               |  86 ++++++------
 readme/service-collection.md                  | 110 +++++++--------
 readme/service-provider.md                    | 106 +++++++-------
 readme/singleton.md                           |  60 ++++----
 readme/span-and-readonlyspan.md               |  60 ++++----
 readme/tag-attribute.md                       |  50 +++----
 readme/tags.md                                |  82 +++++------
 readme/threadsafe-hint.md                     |  48 +++----
 readme/tostring-hint.md                       |  48 +++----
 readme/transient.md                           |  50 +++----
 readme/tuple.md                               |  52 +++----
 readme/type-attribute.md                      |  50 +++----
 .../Core/Code/BlockCodeBuilder.cs             |  37 ++---
 src/Pure.DI.Core/Core/Code/BuildContext.cs    |   2 +-
 src/Pure.DI.Core/Core/Code/BuildTools.cs      |   2 +-
 .../Core/Code/CompositionBuilder.cs           |  16 ++-
 .../Core/Code/ConstructCodeBuilder.cs         |   4 +-
 .../Core/Code/FactoryCodeBuilder.cs           |   6 +-
 src/Pure.DI.Core/Core/Code/IBuildTools.cs     |   2 +-
 .../Core/Code/StatementCodeBuilder.cs         |   2 +-
 src/Pure.DI.Core/Core/Code/Variable.cs        |   8 --
 src/Pure.DI.Core/Core/Code/VariableInfo.cs    |  11 +-
 .../Core/Code/VariablesBuilder.cs             |   9 +-
 src/Pure.DI.Core/Core/Code/VariablesMap.cs    |  10 +-
 .../LifetimesTests.cs                         |   3 +-
 72 files changed, 1743 insertions(+), 1752 deletions(-)

diff --git a/.run/Pack.run.xml b/.run/Pack.run.xml
index d5760a48..14ff37a2 100644
--- a/.run/Pack.run.xml
+++ b/.run/Pack.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Pack" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/build/bin/roslyn4.3/Debug/net7.0/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="-p:version=2.0.17-dev pack" />
+    <option name="PROGRAM_PARAMETERS" value="-p:version=2.0.18-dev pack" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/readme/ArrayDetails.md b/readme/ArrayDetails.md
index 12734a7f..4300c042 100644
--- a/readme/ArrayDetails.md
+++ b/readme/ArrayDetails.md
@@ -75,16 +75,16 @@ classDiagram
 ```c#
 partial class Array
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Array()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Array(Array parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -93,58 +93,58 @@ partial class Array
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.Benchmarks.Model.Service3v4 transientM09D22di26 = new Pure.DI.Benchmarks.Model.Service3v4();
-      Pure.DI.Benchmarks.Model.Service3v3 transientM09D22di25 = new Pure.DI.Benchmarks.Model.Service3v3();
-      Pure.DI.Benchmarks.Model.Service3v2 transientM09D22di24 = new Pure.DI.Benchmarks.Model.Service3v2();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di23 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.IService3[] transientM09D22di22 = new Pure.DI.Benchmarks.Model.IService3[4]
+      var transientM09D23di26 = new Pure.DI.Benchmarks.Model.Service3v4();
+      var transientM09D23di25 = new Pure.DI.Benchmarks.Model.Service3v3();
+      var transientM09D23di24 = new Pure.DI.Benchmarks.Model.Service3v2();
+      var transientM09D23di23 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di22 = new Pure.DI.Benchmarks.Model.IService3[4]
       {
-          transientM09D22di23,
-          transientM09D22di24,
-          transientM09D22di25,
-          transientM09D22di26
+          transientM09D23di23,
+          transientM09D23di24,
+          transientM09D23di25,
+          transientM09D23di26
       };
-      Pure.DI.Benchmarks.Model.Service2Array transientM09D22di21 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D22di22);
-      Pure.DI.Benchmarks.Model.Service3v4 transientM09D22di20 = new Pure.DI.Benchmarks.Model.Service3v4();
-      Pure.DI.Benchmarks.Model.Service3v3 transientM09D22di19 = new Pure.DI.Benchmarks.Model.Service3v3();
-      Pure.DI.Benchmarks.Model.Service3v2 transientM09D22di18 = new Pure.DI.Benchmarks.Model.Service3v2();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di17 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.IService3[] transientM09D22di16 = new Pure.DI.Benchmarks.Model.IService3[4]
+      var transientM09D23di21 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D23di22);
+      var transientM09D23di20 = new Pure.DI.Benchmarks.Model.Service3v4();
+      var transientM09D23di19 = new Pure.DI.Benchmarks.Model.Service3v3();
+      var transientM09D23di18 = new Pure.DI.Benchmarks.Model.Service3v2();
+      var transientM09D23di17 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di16 = new Pure.DI.Benchmarks.Model.IService3[4]
       {
-          transientM09D22di17,
-          transientM09D22di18,
-          transientM09D22di19,
-          transientM09D22di20
+          transientM09D23di17,
+          transientM09D23di18,
+          transientM09D23di19,
+          transientM09D23di20
       };
-      Pure.DI.Benchmarks.Model.Service3v4 transientM09D22di15 = new Pure.DI.Benchmarks.Model.Service3v4();
-      Pure.DI.Benchmarks.Model.Service3v3 transientM09D22di14 = new Pure.DI.Benchmarks.Model.Service3v3();
-      Pure.DI.Benchmarks.Model.Service3v2 transientM09D22di13 = new Pure.DI.Benchmarks.Model.Service3v2();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di12 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.IService3[] transientM09D22di11 = new Pure.DI.Benchmarks.Model.IService3[4]
+      var transientM09D23di15 = new Pure.DI.Benchmarks.Model.Service3v4();
+      var transientM09D23di14 = new Pure.DI.Benchmarks.Model.Service3v3();
+      var transientM09D23di13 = new Pure.DI.Benchmarks.Model.Service3v2();
+      var transientM09D23di12 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di11 = new Pure.DI.Benchmarks.Model.IService3[4]
       {
-          transientM09D22di12,
-          transientM09D22di13,
-          transientM09D22di14,
-          transientM09D22di15
+          transientM09D23di12,
+          transientM09D23di13,
+          transientM09D23di14,
+          transientM09D23di15
       };
-      Pure.DI.Benchmarks.Model.Service3v4 transientM09D22di10 = new Pure.DI.Benchmarks.Model.Service3v4();
-      Pure.DI.Benchmarks.Model.Service3v3 transientM09D22di9 = new Pure.DI.Benchmarks.Model.Service3v3();
-      Pure.DI.Benchmarks.Model.Service3v2 transientM09D22di8 = new Pure.DI.Benchmarks.Model.Service3v2();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di7 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.IService3[] transientM09D22di6 = new Pure.DI.Benchmarks.Model.IService3[4]
+      var transientM09D23di10 = new Pure.DI.Benchmarks.Model.Service3v4();
+      var transientM09D23di9 = new Pure.DI.Benchmarks.Model.Service3v3();
+      var transientM09D23di8 = new Pure.DI.Benchmarks.Model.Service3v2();
+      var transientM09D23di7 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di6 = new Pure.DI.Benchmarks.Model.IService3[4]
       {
-          transientM09D22di7,
-          transientM09D22di8,
-          transientM09D22di9,
-          transientM09D22di10
+          transientM09D23di7,
+          transientM09D23di8,
+          transientM09D23di9,
+          transientM09D23di10
       };
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di5 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service2Array transientM09D22di4 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D22di6);
-      Pure.DI.Benchmarks.Model.Service2Array transientM09D22di3 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D22di11);
-      Pure.DI.Benchmarks.Model.Service2Array transientM09D22di2 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D22di16);
-      Pure.DI.Benchmarks.Model.Service1 transientM09D22di1 = new Pure.DI.Benchmarks.Model.Service1(transientM09D22di21);
-      Pure.DI.Benchmarks.Model.CompositionRoot transientM09D22di0 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D22di1, transientM09D22di2, transientM09D22di3, transientM09D22di4, transientM09D22di5);
-      return transientM09D22di0;
+      var transientM09D23di5 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di4 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D23di6);
+      var transientM09D23di3 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D23di11);
+      var transientM09D23di2 = new Pure.DI.Benchmarks.Model.Service2Array(transientM09D23di16);
+      var transientM09D23di1 = new Pure.DI.Benchmarks.Model.Service1(transientM09D23di21);
+      var transientM09D23di0 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D23di1, transientM09D23di2, transientM09D23di3, transientM09D23di4, transientM09D23di5);
+      return transientM09D23di0;
     }
   }
   #endregion
@@ -156,7 +156,7 @@ partial class Array
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -165,7 +165,7 @@ partial class Array
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -174,10 +174,10 @@ partial class Array
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -193,10 +193,10 @@ partial class Array
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -273,26 +273,26 @@ partial class Array
         "  Array ..> CompositionRoot : ICompositionRoot Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Array, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Array, object>>[] _bucketsM09D23di;
   
   static Array()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Array, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Array, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Array, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Array, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Array, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Array, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Array, T>
   {
-    public static global::Pure.DI.IResolver<Array, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Array, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Array composite)
     {
@@ -305,7 +305,7 @@ partial class Array
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Array, Pure.DI.Benchmarks.Model.ICompositionRoot>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Array, Pure.DI.Benchmarks.Model.ICompositionRoot>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.Benchmarks.Model.ICompositionRoot Resolve(Array composition)
diff --git a/readme/Console.md b/readme/Console.md
index 110a709d..f1319395 100644
--- a/readme/Console.md
+++ b/readme/Console.md
@@ -99,7 +99,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.0.18">
+        <PackageReference Include="Pure.DI" Version="2.0.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md
index afeef63e..5414a6d0 100644
--- a/readme/ConsoleTopLevelStatements.md
+++ b/readme/ConsoleTopLevelStatements.md
@@ -88,7 +88,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.0.18">
+        <PackageReference Include="Pure.DI" Version="2.0.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/EnumDetails.md b/readme/EnumDetails.md
index 546c11b3..d9aefe2b 100644
--- a/readme/EnumDetails.md
+++ b/readme/EnumDetails.md
@@ -75,16 +75,16 @@ classDiagram
 ```c#
 partial class Enum
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Enum()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Enum(Enum parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -93,30 +93,30 @@ partial class Enum
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      System.Collections.Generic.IEnumerable<Pure.DI.Benchmarks.Model.IService3> perResolveM09D22di33 = default(System.Collections.Generic.IEnumerable<Pure.DI.Benchmarks.Model.IService3>);
-      if (global::System.Object.ReferenceEquals(perResolveM09D22di33, null))
+      var perResolveM09D23di33 = default(System.Collections.Generic.IEnumerable<Pure.DI.Benchmarks.Model.IService3>);
+      if (global::System.Object.ReferenceEquals(perResolveM09D23di33, null))
       {
-          System.Collections.Generic.IEnumerable<Pure.DI.Benchmarks.Model.IService3> LocalFunc_perResolveM09D22di33()
+          System.Collections.Generic.IEnumerable<Pure.DI.Benchmarks.Model.IService3> LocalFunc_perResolveM09D23di33()
           {
-              Pure.DI.Benchmarks.Model.Service3 transientM09D22di35 = new Pure.DI.Benchmarks.Model.Service3();
-              yield return transientM09D22di35;
-              Pure.DI.Benchmarks.Model.Service3v2 transientM09D22di36 = new Pure.DI.Benchmarks.Model.Service3v2();
-              yield return transientM09D22di36;
-              Pure.DI.Benchmarks.Model.Service3v3 transientM09D22di37 = new Pure.DI.Benchmarks.Model.Service3v3();
-              yield return transientM09D22di37;
-              Pure.DI.Benchmarks.Model.Service3v4 transientM09D22di38 = new Pure.DI.Benchmarks.Model.Service3v4();
-              yield return transientM09D22di38;
+              var transientM09D23di35 = new Pure.DI.Benchmarks.Model.Service3();
+              yield return transientM09D23di35;
+              var transientM09D23di36 = new Pure.DI.Benchmarks.Model.Service3v2();
+              yield return transientM09D23di36;
+              var transientM09D23di37 = new Pure.DI.Benchmarks.Model.Service3v3();
+              yield return transientM09D23di37;
+              var transientM09D23di38 = new Pure.DI.Benchmarks.Model.Service3v4();
+              yield return transientM09D23di38;
           }
-          perResolveM09D22di33 = LocalFunc_perResolveM09D22di33();
+          perResolveM09D23di33 = LocalFunc_perResolveM09D23di33();
       }
-      Pure.DI.Benchmarks.Model.Service2Enum transientM09D22di34 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D22di33);
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di32 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service2Enum transientM09D22di31 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D22di33);
-      Pure.DI.Benchmarks.Model.Service2Enum transientM09D22di30 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D22di33);
-      Pure.DI.Benchmarks.Model.Service2Enum transientM09D22di29 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D22di33);
-      Pure.DI.Benchmarks.Model.Service1 transientM09D22di28 = new Pure.DI.Benchmarks.Model.Service1(transientM09D22di34);
-      Pure.DI.Benchmarks.Model.CompositionRoot transientM09D22di27 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D22di28, transientM09D22di29, transientM09D22di30, transientM09D22di31, transientM09D22di32);
-      return transientM09D22di27;
+      var transientM09D23di34 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D23di33);
+      var transientM09D23di32 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di31 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D23di33);
+      var transientM09D23di30 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D23di33);
+      var transientM09D23di29 = new Pure.DI.Benchmarks.Model.Service2Enum(perResolveM09D23di33);
+      var transientM09D23di28 = new Pure.DI.Benchmarks.Model.Service1(transientM09D23di34);
+      var transientM09D23di27 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D23di28, transientM09D23di29, transientM09D23di30, transientM09D23di31, transientM09D23di32);
+      return transientM09D23di27;
     }
   }
   #endregion
@@ -128,7 +128,7 @@ partial class Enum
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -137,7 +137,7 @@ partial class Enum
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -146,10 +146,10 @@ partial class Enum
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -165,10 +165,10 @@ partial class Enum
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -245,26 +245,26 @@ partial class Enum
         "  Enum ..> CompositionRoot : ICompositionRoot Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Enum, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Enum, object>>[] _bucketsM09D23di;
   
   static Enum()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Enum, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Enum, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Enum, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Enum, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Enum, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Enum, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Enum, T>
   {
-    public static global::Pure.DI.IResolver<Enum, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Enum, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Enum composite)
     {
@@ -277,7 +277,7 @@ partial class Enum
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Enum, Pure.DI.Benchmarks.Model.ICompositionRoot>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Enum, Pure.DI.Benchmarks.Model.ICompositionRoot>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.Benchmarks.Model.ICompositionRoot Resolve(Enum composition)
diff --git a/readme/FuncDetails.md b/readme/FuncDetails.md
index 6af7d0f7..7ed27160 100644
--- a/readme/FuncDetails.md
+++ b/readme/FuncDetails.md
@@ -60,16 +60,16 @@ classDiagram
 ```c#
 partial class Func
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Func()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Func(Func parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -78,25 +78,25 @@ partial class Func
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      System.Func<Pure.DI.Benchmarks.Model.IService3> perResolveM09D22di57 = default(System.Func<Pure.DI.Benchmarks.Model.IService3>);
-      if (global::System.Object.ReferenceEquals(perResolveM09D22di57, null))
+      var perResolveM09D23di57 = default(System.Func<Pure.DI.Benchmarks.Model.IService3>);
+      if (global::System.Object.ReferenceEquals(perResolveM09D23di57, null))
       {
-          perResolveM09D22di57 = new global::System.Func<Pure.DI.Benchmarks.Model.IService3>(() =>
+          perResolveM09D23di57 = new global::System.Func<Pure.DI.Benchmarks.Model.IService3>(() =>
           {
               Pure.DI.Benchmarks.Model.IService3 value;
-              Pure.DI.Benchmarks.Model.Service3 transientM09D22di59 = new Pure.DI.Benchmarks.Model.Service3();
-              value = transientM09D22di59;
+              var transientM09D23di59 = new Pure.DI.Benchmarks.Model.Service3();
+              value = transientM09D23di59;
               return value;
           });
       }
-      Pure.DI.Benchmarks.Model.Service2Func transientM09D22di58 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D22di57);
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di56 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service2Func transientM09D22di55 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D22di57);
-      Pure.DI.Benchmarks.Model.Service2Func transientM09D22di54 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D22di57);
-      Pure.DI.Benchmarks.Model.Service2Func transientM09D22di53 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D22di57);
-      Pure.DI.Benchmarks.Model.Service1 transientM09D22di52 = new Pure.DI.Benchmarks.Model.Service1(transientM09D22di58);
-      Pure.DI.Benchmarks.Model.CompositionRoot transientM09D22di51 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D22di52, transientM09D22di53, transientM09D22di54, transientM09D22di55, transientM09D22di56);
-      return transientM09D22di51;
+      var transientM09D23di58 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D23di57);
+      var transientM09D23di56 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di55 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D23di57);
+      var transientM09D23di54 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D23di57);
+      var transientM09D23di53 = new Pure.DI.Benchmarks.Model.Service2Func(perResolveM09D23di57);
+      var transientM09D23di52 = new Pure.DI.Benchmarks.Model.Service1(transientM09D23di58);
+      var transientM09D23di51 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D23di52, transientM09D23di53, transientM09D23di54, transientM09D23di55, transientM09D23di56);
+      return transientM09D23di51;
     }
   }
   #endregion
@@ -108,7 +108,7 @@ partial class Func
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -117,7 +117,7 @@ partial class Func
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -126,10 +126,10 @@ partial class Func
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -145,10 +145,10 @@ partial class Func
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -210,26 +210,26 @@ partial class Func
         "  FuncᐸIService3ᐳ *--  Service3 : IService3";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Func, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Func, object>>[] _bucketsM09D23di;
   
   static Func()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Func, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Func, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Func, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Func, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Func, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Func, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Func, T>
   {
-    public static global::Pure.DI.IResolver<Func, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Func, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Func composite)
     {
@@ -242,7 +242,7 @@ partial class Func
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Func, Pure.DI.Benchmarks.Model.ICompositionRoot>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Func, Pure.DI.Benchmarks.Model.ICompositionRoot>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.Benchmarks.Model.ICompositionRoot Resolve(Func composition)
diff --git a/readme/SingletonDetails.md b/readme/SingletonDetails.md
index 258de020..7e29546c 100644
--- a/readme/SingletonDetails.md
+++ b/readme/SingletonDetails.md
@@ -62,20 +62,20 @@ classDiagram
 ```c#
 partial class Singleton
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.Benchmarks.Model.Service1 _singletonM09D22di23;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.Benchmarks.Model.Service1 _singletonM09D23di23;
   
   public Singleton()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Singleton(Singleton parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di23 = parent._singletonM09D22di23;
+      _singletonM09D23di23 = parent._singletonM09D23di23;
     }
   }
   
@@ -85,37 +85,37 @@ partial class Singleton
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di83 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di82 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di81 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di80 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di79 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di78 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di77 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di76 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di75 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di74 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di73 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di72 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di71 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di70 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di69 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di68 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di67 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di69, transientM09D22di70, transientM09D22di71, transientM09D22di72, transientM09D22di73);
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di66 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di74, transientM09D22di75, transientM09D22di76, transientM09D22di77, transientM09D22di78);
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di65 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di79, transientM09D22di80, transientM09D22di81, transientM09D22di82, transientM09D22di83);
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+      var transientM09D23di83 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di82 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di81 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di80 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di79 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di78 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di77 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di76 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di75 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di74 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di73 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di72 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di71 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di70 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di69 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di68 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di67 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di69, transientM09D23di70, transientM09D23di71, transientM09D23di72, transientM09D23di73);
+      var transientM09D23di66 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di74, transientM09D23di75, transientM09D23di76, transientM09D23di77, transientM09D23di78);
+      var transientM09D23di65 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di79, transientM09D23di80, transientM09D23di81, transientM09D23di82, transientM09D23di83);
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
       {
-          Pure.DI.Benchmarks.Model.Service3 transientM09D22di89 = new Pure.DI.Benchmarks.Model.Service3();
-          Pure.DI.Benchmarks.Model.Service3 transientM09D22di88 = new Pure.DI.Benchmarks.Model.Service3();
-          Pure.DI.Benchmarks.Model.Service3 transientM09D22di87 = new Pure.DI.Benchmarks.Model.Service3();
-          Pure.DI.Benchmarks.Model.Service3 transientM09D22di86 = new Pure.DI.Benchmarks.Model.Service3();
-          Pure.DI.Benchmarks.Model.Service3 transientM09D22di85 = new Pure.DI.Benchmarks.Model.Service3();
-          Pure.DI.Benchmarks.Model.Service2 transientM09D22di84 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di85, transientM09D22di86, transientM09D22di87, transientM09D22di88, transientM09D22di89);
-          _singletonM09D22di23 = new Pure.DI.Benchmarks.Model.Service1(transientM09D22di84);
+          var transientM09D23di89 = new Pure.DI.Benchmarks.Model.Service3();
+          var transientM09D23di88 = new Pure.DI.Benchmarks.Model.Service3();
+          var transientM09D23di87 = new Pure.DI.Benchmarks.Model.Service3();
+          var transientM09D23di86 = new Pure.DI.Benchmarks.Model.Service3();
+          var transientM09D23di85 = new Pure.DI.Benchmarks.Model.Service3();
+          var transientM09D23di84 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di85, transientM09D23di86, transientM09D23di87, transientM09D23di88, transientM09D23di89);
+          _singletonM09D23di23 = new Pure.DI.Benchmarks.Model.Service1(transientM09D23di84);
       }
-      Pure.DI.Benchmarks.Model.CompositionRoot transientM09D22di63 = new Pure.DI.Benchmarks.Model.CompositionRoot(_singletonM09D22di23, transientM09D22di65, transientM09D22di66, transientM09D22di67, transientM09D22di68);
-      return transientM09D22di63;
+      var transientM09D23di63 = new Pure.DI.Benchmarks.Model.CompositionRoot(_singletonM09D23di23, transientM09D23di65, transientM09D23di66, transientM09D23di67, transientM09D23di68);
+      return transientM09D23di63;
     }
   }
   #endregion
@@ -127,7 +127,7 @@ partial class Singleton
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -136,7 +136,7 @@ partial class Singleton
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -145,10 +145,10 @@ partial class Singleton
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -164,10 +164,10 @@ partial class Singleton
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -231,26 +231,26 @@ partial class Singleton
         "  Singleton ..> CompositionRoot : ICompositionRoot Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>[] _bucketsM09D23di;
   
   static Singleton()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Singleton, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Singleton, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Singleton, T>
   {
-    public static global::Pure.DI.IResolver<Singleton, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Singleton, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Singleton composite)
     {
@@ -263,7 +263,7 @@ partial class Singleton
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Singleton, Pure.DI.Benchmarks.Model.ICompositionRoot>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Singleton, Pure.DI.Benchmarks.Model.ICompositionRoot>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.Benchmarks.Model.ICompositionRoot Resolve(Singleton composition)
diff --git a/readme/TransientDetails.md b/readme/TransientDetails.md
index 6c41507e..a8ee33e4 100644
--- a/readme/TransientDetails.md
+++ b/readme/TransientDetails.md
@@ -62,16 +62,16 @@ classDiagram
 ```c#
 partial class Transient
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Transient()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Transient(Transient parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -80,34 +80,34 @@ partial class Transient
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di116 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di115 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di114 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di113 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di112 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di111 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di112, transientM09D22di113, transientM09D22di114, transientM09D22di115, transientM09D22di116);
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di110 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di109 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di108 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di107 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di106 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di105 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di104 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di103 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di102 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di101 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di100 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di99 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di98 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di97 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di96 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service3 transientM09D22di95 = new Pure.DI.Benchmarks.Model.Service3();
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di94 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di96, transientM09D22di97, transientM09D22di98, transientM09D22di99, transientM09D22di100);
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di93 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di101, transientM09D22di102, transientM09D22di103, transientM09D22di104, transientM09D22di105);
-      Pure.DI.Benchmarks.Model.Service2 transientM09D22di92 = new Pure.DI.Benchmarks.Model.Service2(transientM09D22di106, transientM09D22di107, transientM09D22di108, transientM09D22di109, transientM09D22di110);
-      Pure.DI.Benchmarks.Model.Service1 transientM09D22di91 = new Pure.DI.Benchmarks.Model.Service1(transientM09D22di111);
-      Pure.DI.Benchmarks.Model.CompositionRoot transientM09D22di90 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D22di91, transientM09D22di92, transientM09D22di93, transientM09D22di94, transientM09D22di95);
-      return transientM09D22di90;
+      var transientM09D23di116 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di115 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di114 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di113 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di112 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di111 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di112, transientM09D23di113, transientM09D23di114, transientM09D23di115, transientM09D23di116);
+      var transientM09D23di110 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di109 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di108 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di107 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di106 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di105 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di104 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di103 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di102 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di101 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di100 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di99 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di98 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di97 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di96 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di95 = new Pure.DI.Benchmarks.Model.Service3();
+      var transientM09D23di94 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di96, transientM09D23di97, transientM09D23di98, transientM09D23di99, transientM09D23di100);
+      var transientM09D23di93 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di101, transientM09D23di102, transientM09D23di103, transientM09D23di104, transientM09D23di105);
+      var transientM09D23di92 = new Pure.DI.Benchmarks.Model.Service2(transientM09D23di106, transientM09D23di107, transientM09D23di108, transientM09D23di109, transientM09D23di110);
+      var transientM09D23di91 = new Pure.DI.Benchmarks.Model.Service1(transientM09D23di111);
+      var transientM09D23di90 = new Pure.DI.Benchmarks.Model.CompositionRoot(transientM09D23di91, transientM09D23di92, transientM09D23di93, transientM09D23di94, transientM09D23di95);
+      return transientM09D23di90;
     }
   }
   #endregion
@@ -119,7 +119,7 @@ partial class Transient
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -128,7 +128,7 @@ partial class Transient
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -137,10 +137,10 @@ partial class Transient
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -156,10 +156,10 @@ partial class Transient
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -223,26 +223,26 @@ partial class Transient
         "  Transient ..> CompositionRoot : ICompositionRoot Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Transient, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Transient, object>>[] _bucketsM09D23di;
   
   static Transient()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Transient, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.Benchmarks.Model.ICompositionRoot>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Transient, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Transient, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Transient, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Transient, object>>(typeof(Pure.DI.Benchmarks.Model.ICompositionRoot), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Transient, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Transient, T>
   {
-    public static global::Pure.DI.IResolver<Transient, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Transient, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Transient composite)
     {
@@ -255,7 +255,7 @@ partial class Transient
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Transient, Pure.DI.Benchmarks.Model.ICompositionRoot>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Transient, Pure.DI.Benchmarks.Model.ICompositionRoot>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.Benchmarks.Model.ICompositionRoot Resolve(Transient composition)
diff --git a/readme/WebAPI.md b/readme/WebAPI.md
index 52c213e2..a46cc727 100644
--- a/readme/WebAPI.md
+++ b/readme/WebAPI.md
@@ -97,7 +97,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.0.18">
+        <PackageReference Include="Pure.DI" Version="2.0.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/Wpf.md b/readme/Wpf.md
index a9d31efc..0e058fb6 100644
--- a/readme/Wpf.md
+++ b/readme/Wpf.md
@@ -68,7 +68,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.0.18">
+        <PackageReference Include="Pure.DI" Version="2.0.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/a-few-partial-classes.md b/readme/a-few-partial-classes.md
index 633b3797..d830fc3a 100644
--- a/readme/a-few-partial-classes.md
+++ b/readme/a-few-partial-classes.md
@@ -85,16 +85,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -103,9 +103,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.Dependency transientM09D22di99 = new Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.Dependency();
-      Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.Service transientM09D22di98 = new Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.Service(transientM09D22di99);
-      return transientM09D22di98;
+      var transientM09D23di99 = new Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.Dependency();
+      var transientM09D23di98 = new Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.Service(transientM09D23di99);
+      return transientM09D23di98;
     }
   }
   #endregion
@@ -117,7 +117,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -126,7 +126,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -135,10 +135,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -154,10 +154,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -197,26 +197,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -229,7 +229,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.SeveralPartialClassesScenario.IService Resolve(Composition composition)
diff --git a/readme/advanced-interception.md b/readme/advanced-interception.md
index 46f73003..f0736dc2 100644
--- a/readme/advanced-interception.md
+++ b/readme/advanced-interception.md
@@ -150,16 +150,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -168,9 +168,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.Dependency transientM09D22di119 = new Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.Dependency();
-      Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.Service transientM09D22di118 = new Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.Service(OnDependencyInjection<Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IDependency>(transientM09D22di119, null, Pure.DI.Lifetime.Transient));
-      return OnDependencyInjection<Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService>(transientM09D22di118, null, Pure.DI.Lifetime.Transient);
+      var transientM09D23di119 = new Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.Dependency();
+      var transientM09D23di118 = new Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.Service(OnDependencyInjection<Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IDependency>(transientM09D23di119, null, Pure.DI.Lifetime.Transient));
+      return OnDependencyInjection<Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService>(transientM09D23di118, null, Pure.DI.Lifetime.Transient);
     }
   }
   #endregion
@@ -182,7 +182,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -191,7 +191,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -200,10 +200,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -219,10 +219,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -265,26 +265,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -297,7 +297,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Interception.AdvancedInterceptionScenario.IService Resolve(Composition composition)
diff --git a/readme/arguments.md b/readme/arguments.md
index 7f748f34..54457c7e 100644
--- a/readme/arguments.md
+++ b/readme/arguments.md
@@ -96,9 +96,9 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private readonly int _argM09D22diid;
-  private readonly string _argM09D22diserviceName;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private readonly int _argM09D23diid;
+  private readonly string _argM09D23diserviceName;
   
   public Composition(int id, string serviceName)
   {
@@ -107,16 +107,16 @@ partial class Composition
       throw new global::System.ArgumentNullException("serviceName");
     }
     
-    _argM09D22diid = id;
-    _argM09D22diserviceName = serviceName;
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _argM09D23diid = id;
+    _argM09D23diserviceName = serviceName;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    _argM09D22diid = parent._argM09D22diid;
-    _argM09D22diserviceName = parent._argM09D22diserviceName;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    _argM09D23diid = parent._argM09D23diid;
+    _argM09D23diserviceName = parent._argM09D23diserviceName;
   }
   
   #region Composition Roots
@@ -125,9 +125,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.ArgumentsScenario.Dependency transientM09D22di48 = new Pure.DI.UsageTests.Basics.ArgumentsScenario.Dependency(_argM09D22diid);
-      Pure.DI.UsageTests.Basics.ArgumentsScenario.Service transientM09D22di46 = new Pure.DI.UsageTests.Basics.ArgumentsScenario.Service(_argM09D22diserviceName, transientM09D22di48);
-      return transientM09D22di46;
+      var transientM09D23di48 = new Pure.DI.UsageTests.Basics.ArgumentsScenario.Dependency(_argM09D23diid);
+      var transientM09D23di46 = new Pure.DI.UsageTests.Basics.ArgumentsScenario.Service(_argM09D23diserviceName, transientM09D23di48);
+      return transientM09D23di46;
     }
   }
   #endregion
@@ -139,7 +139,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -148,7 +148,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -157,10 +157,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -176,10 +176,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -223,26 +223,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.ArgumentsScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.ArgumentsScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ArgumentsScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ArgumentsScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -255,7 +255,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ArgumentsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ArgumentsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.ArgumentsScenario.IService Resolve(Composition composition)
diff --git a/readme/array.md b/readme/array.md
index 53ee000f..1ac3c80f 100644
--- a/readme/array.md
+++ b/readme/array.md
@@ -81,16 +81,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -99,15 +99,15 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.BCL.ArrayScenario.XyzDependency transientM09D22di18 = new Pure.DI.UsageTests.BCL.ArrayScenario.XyzDependency();
-      Pure.DI.UsageTests.BCL.ArrayScenario.AbcDependency transientM09D22di17 = new Pure.DI.UsageTests.BCL.ArrayScenario.AbcDependency();
-      Pure.DI.UsageTests.BCL.ArrayScenario.IDependency[] transientM09D22di16 = new Pure.DI.UsageTests.BCL.ArrayScenario.IDependency[2]
+      var transientM09D23di18 = new Pure.DI.UsageTests.BCL.ArrayScenario.XyzDependency();
+      var transientM09D23di17 = new Pure.DI.UsageTests.BCL.ArrayScenario.AbcDependency();
+      var transientM09D23di16 = new Pure.DI.UsageTests.BCL.ArrayScenario.IDependency[2]
       {
-          transientM09D22di17,
-          transientM09D22di18
+          transientM09D23di17,
+          transientM09D23di18
       };
-      Pure.DI.UsageTests.BCL.ArrayScenario.Service transientM09D22di15 = new Pure.DI.UsageTests.BCL.ArrayScenario.Service(transientM09D22di16);
-      return transientM09D22di15;
+      var transientM09D23di15 = new Pure.DI.UsageTests.BCL.ArrayScenario.Service(transientM09D23di16);
+      return transientM09D23di15;
     }
   }
   #endregion
@@ -119,7 +119,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -128,7 +128,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -137,10 +137,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -156,10 +156,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -206,26 +206,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.ArrayScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.ArrayScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.ArrayScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.ArrayScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -238,7 +238,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.ArrayScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.ArrayScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ArrayScenario.IService Resolve(Composition composition)
diff --git a/readme/auto-bindings.md b/readme/auto-bindings.md
index ee760aa9..2fd15da5 100644
--- a/readme/auto-bindings.md
+++ b/readme/auto-bindings.md
@@ -59,16 +59,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -77,9 +77,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.AutoBindingScenario.Dependency transientM09D22di51 = new Pure.DI.UsageTests.Basics.AutoBindingScenario.Dependency();
-      Pure.DI.UsageTests.Basics.AutoBindingScenario.Service transientM09D22di50 = new Pure.DI.UsageTests.Basics.AutoBindingScenario.Service(transientM09D22di51);
-      return transientM09D22di50;
+      var transientM09D23di51 = new Pure.DI.UsageTests.Basics.AutoBindingScenario.Dependency();
+      var transientM09D23di50 = new Pure.DI.UsageTests.Basics.AutoBindingScenario.Service(transientM09D23di51);
+      return transientM09D23di50;
     }
   }
   #endregion
@@ -91,7 +91,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -100,7 +100,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -109,10 +109,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -128,10 +128,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -163,26 +163,26 @@ partial class Composition
         "  Composition ..> Service : Service Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.AutoBindingScenario.Service>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.AutoBindingScenario.Service>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.AutoBindingScenario.Service), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.AutoBindingScenario.Service), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -195,7 +195,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.AutoBindingScenario.Service>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.AutoBindingScenario.Service>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.AutoBindingScenario.Service Resolve(Composition composition)
diff --git a/readme/child-composition.md b/readme/child-composition.md
index 1b002729..fd840459 100644
--- a/readme/child-composition.md
+++ b/readme/child-composition.md
@@ -89,21 +89,21 @@ classDiagram
 ```c#
 partial class Composition: System.IDisposable
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private int _disposeIndexM09D22di;
-  private Pure.DI.UsageTests.Basics.ChildCompositionScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private int _disposeIndexM09D23di;
+  private Pure.DI.UsageTests.Basics.ChildCompositionScenario.Dependency _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[1];
+    _disposableSingletonsM09D23di = new System.IDisposable[1];
   }
   
   internal Composition(Composition parent)
   {
-    lock (parent._disposableSingletonsM09D22di)
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _disposableSingletonsM09D22di = new System.IDisposable[1 - parent._disposeIndexM09D22di];
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _disposableSingletonsM09D23di = new System.IDisposable[1 - parent._disposeIndexM09D23di];
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
@@ -113,19 +113,19 @@ partial class Composition: System.IDisposable
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.Basics.ChildCompositionScenario.Dependency();
-                  _disposableSingletonsM09D22di[_disposeIndexM09D22di++] = _singletonM09D22di22;
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.Basics.ChildCompositionScenario.Dependency();
+                  _disposableSingletonsM09D23di[_disposeIndexM09D23di++] = _singletonM09D23di22;
               }
           }
       }
-      Pure.DI.UsageTests.Basics.ChildCompositionScenario.Service transientM09D22di52 = new Pure.DI.UsageTests.Basics.ChildCompositionScenario.Service(_singletonM09D22di22);
-      return transientM09D22di52;
+      var transientM09D23di52 = new Pure.DI.UsageTests.Basics.ChildCompositionScenario.Service(_singletonM09D23di22);
+      return transientM09D23di52;
     }
   }
   #endregion
@@ -137,7 +137,7 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -146,7 +146,7 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -155,10 +155,10 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -174,10 +174,10 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -190,13 +190,13 @@ partial class Composition: System.IDisposable
   
   public void Dispose()
   {
-    lock (_disposableSingletonsM09D22di)
+    lock (_disposableSingletonsM09D23di)
     {
-      while (_disposeIndexM09D22di > 0)
+      while (_disposeIndexM09D23di > 0)
       {
         try
         {
-          _disposableSingletonsM09D22di[--_disposeIndexM09D22di].Dispose();
+          _disposableSingletonsM09D23di[--_disposeIndexM09D23di].Dispose();
         }
         catch
         {
@@ -204,7 +204,7 @@ partial class Composition: System.IDisposable
         }
       }
       
-      _singletonM09D22di22 = null;
+      _singletonM09D23di22 = null;
     }
   }
   
@@ -238,26 +238,26 @@ partial class Composition: System.IDisposable
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -270,7 +270,7 @@ partial class Composition: System.IDisposable
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.ChildCompositionScenario.IService Resolve(Composition composition)
diff --git a/readme/complex-generics.md b/readme/complex-generics.md
index f11a2afb..be3e856c 100644
--- a/readme/complex-generics.md
+++ b/readme/complex-generics.md
@@ -113,16 +113,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -131,11 +131,11 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.ComplexGenericsScenario.DependencyStruct<int> transientM09D22di56 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.DependencyStruct<int>();
-      Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Dependency<string> transientM09D22di55 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Dependency<string>();
-      Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Service<string, int, System.Collections.Generic.List<string>, System.Collections.Generic.Dictionary<string, int>> transientM09D22di54 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Service<string, int, System.Collections.Generic.List<string>, System.Collections.Generic.Dictionary<string, int>>(transientM09D22di55, transientM09D22di56);
-      Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string> transientM09D22di53 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>(transientM09D22di54);
-      return transientM09D22di53;
+      var transientM09D23di56 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.DependencyStruct<int>();
+      var transientM09D23di55 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Dependency<string>();
+      var transientM09D23di54 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Service<string, int, System.Collections.Generic.List<string>, System.Collections.Generic.Dictionary<string, int>>(transientM09D23di55, transientM09D23di56);
+      var transientM09D23di53 = new Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>(transientM09D23di54);
+      return transientM09D23di53;
     }
   }
   #endregion
@@ -147,7 +147,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -156,7 +156,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -165,10 +165,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -184,10 +184,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -239,26 +239,26 @@ partial class Composition
         "  ServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ *--  DependencyStructᐸInt32ᐳ : \"value type\"  IDependencyᐸInt32ᐳ";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -271,7 +271,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string>>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.ComplexGenericsScenario.Program<string> Resolve(Composition composition)
diff --git a/readme/composition-roots.md b/readme/composition-roots.md
index 08000f07..1c0c389c 100644
--- a/readme/composition-roots.md
+++ b/readme/composition-roots.md
@@ -47,7 +47,7 @@ classDiagram
   class Composition {
     +IService OtherService
     +IService Root
-    -IDependency RootM09D22di_0003
+    -IDependency RootM09D23di_0003
     + T ResolveᐸTᐳ()
     + T ResolveᐸTᐳ(object? tag)
     + object Resolve(Type type)
@@ -74,7 +74,7 @@ classDiagram
   Service *--  Dependency : IDependency
   Composition ..> Service : IService Root
   Composition ..> OtherService : "Other" IService OtherService
-  Composition ..> Dependency : IDependency RootM09D22di_0003
+  Composition ..> Dependency : IDependency RootM09D23di_0003
 ```
 
 </details>
@@ -85,16 +85,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -103,9 +103,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.CompositionRootsScenario.Dependency transientM09D22di58 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.CompositionRootsScenario.Service transientM09D22di57 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.Service(transientM09D22di58);
-      return transientM09D22di57;
+      var transientM09D23di58 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.Dependency();
+      var transientM09D23di57 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.Service(transientM09D23di58);
+      return transientM09D23di57;
     }
   }
   
@@ -114,18 +114,18 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.CompositionRootsScenario.OtherService transientM09D22di59 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.OtherService();
-      return transientM09D22di59;
+      var transientM09D23di59 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.OtherService();
+      return transientM09D23di59;
     }
   }
   
-  private Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency RootM09D22di_0003
+  private Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency RootM09D23di_0003
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.CompositionRootsScenario.Dependency transientM09D22di60 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.Dependency();
-      return transientM09D22di60;
+      var transientM09D23di60 = new Pure.DI.UsageTests.Basics.CompositionRootsScenario.Dependency();
+      return transientM09D23di60;
     }
   }
   #endregion
@@ -137,7 +137,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -146,7 +146,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -155,10 +155,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -174,10 +174,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -195,7 +195,7 @@ partial class Composition
         "  class Composition {\n" +
           "    +IService OtherService\n" +
           "    +IService Root\n" +
-          "    -IDependency RootM09D22di_0003\n" +
+          "    -IDependency RootM09D23di_0003\n" +
           "    + T ResolveᐸTᐳ()\n" +
           "    + T ResolveᐸTᐳ(object? tag)\n" +
           "    + object Resolve(Type type)\n" +
@@ -222,32 +222,32 @@ partial class Composition
         "  Service *--  Dependency : IDependency\n" +
         "  Composition ..> Service : IService Root\n" +
         "  Composition ..> OtherService : \"Other\" IService OtherService\n" +
-        "  Composition ..> Dependency : IDependency RootM09D22di_0003";
+        "  Composition ..> Dependency : IDependency RootM09D23di_0003";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency), valResolverM09D23di_0001)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -260,7 +260,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.CompositionRootsScenario.IService Resolve(Composition composition)
@@ -277,18 +277,18 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency Resolve(Composition composition)
     {
-      return composition.RootM09D22di_0003;
+      return composition.RootM09D23di_0003;
     }
     
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency ResolveByTag(Composition composition, object tag)
     {
-      if (Equals(tag, null)) return composition.RootM09D22di_0003;
+      if (Equals(tag, null)) return composition.RootM09D23di_0003;
       throw new global::System.InvalidOperationException($"Cannot resolve composition root \"{tag}\" of type Pure.DI.UsageTests.Basics.CompositionRootsScenario.IDependency.");
     }
   }
diff --git a/readme/constructor-ordinal-attribute.md b/readme/constructor-ordinal-attribute.md
index 55998c8b..83e348ad 100644
--- a/readme/constructor-ordinal-attribute.md
+++ b/readme/constructor-ordinal-attribute.md
@@ -76,8 +76,8 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private readonly string _argM09D22diserviceName;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private readonly string _argM09D23diserviceName;
   
   public Composition(string serviceName)
   {
@@ -86,14 +86,14 @@ partial class Composition
       throw new global::System.ArgumentNullException("serviceName");
     }
     
-    _argM09D22diserviceName = serviceName;
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _argM09D23diserviceName = serviceName;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    _argM09D22diserviceName = parent._argM09D22diserviceName;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    _argM09D23diserviceName = parent._argM09D23diserviceName;
   }
   
   #region Composition Roots
@@ -102,8 +102,8 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.Service transientM09D22di0 = new Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.Service(_argM09D22diserviceName);
-      return transientM09D22di0;
+      var transientM09D23di0 = new Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.Service(_argM09D23diserviceName);
+      return transientM09D23di0;
     }
   }
   #endregion
@@ -115,7 +115,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -124,7 +124,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -133,10 +133,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -152,10 +152,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -196,26 +196,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -228,7 +228,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Attributes.ConstructorOrdinalAttributeScenario.IService Resolve(Composition composition)
diff --git a/readme/custom-attributes.md b/readme/custom-attributes.md
index f5112344..d145dc05 100644
--- a/readme/custom-attributes.md
+++ b/readme/custom-attributes.md
@@ -103,19 +103,19 @@ classDiagram
 ```c#
 partial class PersonComposition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private readonly int _argM09D22dipersonId;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private readonly int _argM09D23dipersonId;
   
   public PersonComposition(int personId)
   {
-    _argM09D22dipersonId = personId;
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _argM09D23dipersonId = personId;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal PersonComposition(PersonComposition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    _argM09D22dipersonId = parent._argM09D22dipersonId;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    _argM09D23dipersonId = parent._argM09D23dipersonId;
   }
   
   #region Composition Roots
@@ -124,10 +124,10 @@ partial class PersonComposition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      string transientM09D22di3 = "Nik";
-      Pure.DI.UsageTests.Attributes.CustomAttributesScenario.Person transientM09D22di2 = new Pure.DI.UsageTests.Attributes.CustomAttributesScenario.Person(transientM09D22di3);
-      transientM09D22di2.Id = _argM09D22dipersonId;
-      return transientM09D22di2;
+      var transientM09D23di3 = "Nik";
+      var transientM09D23di2 = new Pure.DI.UsageTests.Attributes.CustomAttributesScenario.Person(transientM09D23di3);
+      transientM09D23di2.Id = _argM09D23dipersonId;
+      return transientM09D23di2;
     }
   }
   #endregion
@@ -139,7 +139,7 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -148,7 +148,7 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -157,10 +157,10 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -176,10 +176,10 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -216,26 +216,26 @@ partial class PersonComposition
         "  PersonComposition ..> Person : IPerson Person";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>[] _bucketsM09D23di;
   
   static PersonComposition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>(typeof(Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>(typeof(Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<PersonComposition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<PersonComposition, T>
   {
-    public static global::Pure.DI.IResolver<PersonComposition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<PersonComposition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(PersonComposition composite)
     {
@@ -248,7 +248,7 @@ partial class PersonComposition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<PersonComposition, Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<PersonComposition, Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Attributes.CustomAttributesScenario.IPerson Resolve(PersonComposition composition)
diff --git a/readme/decorator.md b/readme/decorator.md
index 49f11fcf..957865d1 100644
--- a/readme/decorator.md
+++ b/readme/decorator.md
@@ -67,16 +67,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -85,9 +85,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Interception.DecoratorScenario.Service transientM09D22di121 = new Pure.DI.UsageTests.Interception.DecoratorScenario.Service();
-      Pure.DI.UsageTests.Interception.DecoratorScenario.GreetingService transientM09D22di120 = new Pure.DI.UsageTests.Interception.DecoratorScenario.GreetingService(transientM09D22di121);
-      return transientM09D22di120;
+      var transientM09D23di121 = new Pure.DI.UsageTests.Interception.DecoratorScenario.Service();
+      var transientM09D23di120 = new Pure.DI.UsageTests.Interception.DecoratorScenario.GreetingService(transientM09D23di121);
+      return transientM09D23di120;
     }
   }
   #endregion
@@ -99,7 +99,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -108,7 +108,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -117,10 +117,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -136,10 +136,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -176,26 +176,26 @@ partial class Composition
         "  Composition ..> GreetingService : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Interception.DecoratorScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Interception.DecoratorScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Interception.DecoratorScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Interception.DecoratorScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -208,7 +208,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Interception.DecoratorScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Interception.DecoratorScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Interception.DecoratorScenario.IService Resolve(Composition composition)
diff --git a/readme/default-lifetime.md b/readme/default-lifetime.md
index 7f3b9aef..418ea4e6 100644
--- a/readme/default-lifetime.md
+++ b/readme/default-lifetime.md
@@ -82,22 +82,22 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Service _singletonM09D22di23;
-  private Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Service _singletonM09D23di23;
+  private Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Dependency _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di23 = parent._singletonM09D22di23;
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _singletonM09D23di23 = parent._singletonM09D23di23;
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
@@ -107,27 +107,21 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
               {
-                  if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+                  if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
                   {
-                      lock (_disposableSingletonsM09D22di)
-                      {
-                          if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
-                          {
-                              _singletonM09D22di22 = new Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Dependency();
-                          }
-                      }
+                      _singletonM09D23di22 = new Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Dependency();
                   }
-                  _singletonM09D22di23 = new Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Service(_singletonM09D22di22, _singletonM09D22di22);
+                  _singletonM09D23di23 = new Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.Service(_singletonM09D23di22, _singletonM09D23di22);
               }
           }
       }
-      return _singletonM09D22di23;
+      return _singletonM09D23di23;
     }
   }
   #endregion
@@ -139,7 +133,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -148,7 +142,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -157,10 +151,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -176,10 +170,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -220,26 +214,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -252,7 +246,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.DefaultLifetimeScenario.IService Resolve(Composition composition)
diff --git a/readme/dependent-compositions.md b/readme/dependent-compositions.md
index f45fda5c..c10f05c1 100644
--- a/readme/dependent-compositions.md
+++ b/readme/dependent-compositions.md
@@ -95,16 +95,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -113,9 +113,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency transientM09D22di62 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service transientM09D22di61 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service(transientM09D22di62);
-      return transientM09D22di61;
+      var transientM09D23di62 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency();
+      var transientM09D23di61 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service(transientM09D23di62);
+      return transientM09D23di61;
     }
   }
   #endregion
@@ -127,7 +127,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -136,7 +136,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -145,10 +145,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -164,10 +164,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -207,26 +207,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -239,7 +239,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService Resolve(Composition composition)
@@ -266,16 +266,16 @@ partial class Composition
 ```c#
 partial class OtherComposition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public OtherComposition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal OtherComposition(OtherComposition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -284,9 +284,9 @@ partial class OtherComposition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency transientM09D22di64 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service transientM09D22di63 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service(transientM09D22di64);
-      return transientM09D22di63;
+      var transientM09D23di64 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency();
+      var transientM09D23di63 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service(transientM09D23di64);
+      return transientM09D23di63;
     }
   }
   
@@ -295,10 +295,10 @@ partial class OtherComposition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency transientM09D22di67 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service transientM09D22di66 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service(transientM09D22di67);
-      Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program transientM09D22di65 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program(transientM09D22di66);
-      return transientM09D22di65;
+      var transientM09D23di67 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Dependency();
+      var transientM09D23di66 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Service(transientM09D23di67);
+      var transientM09D23di65 = new Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program(transientM09D23di66);
+      return transientM09D23di65;
     }
   }
   #endregion
@@ -310,7 +310,7 @@ partial class OtherComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -319,7 +319,7 @@ partial class OtherComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -328,10 +328,10 @@ partial class OtherComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -347,10 +347,10 @@ partial class OtherComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -396,29 +396,29 @@ partial class OtherComposition
         "  OtherComposition ..> Program : Program Program";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>[] _bucketsM09D23di;
   
   static OtherComposition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>(typeof(Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>(typeof(Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>(typeof(Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<OtherComposition, object>>(typeof(Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program), valResolverM09D23di_0001)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<OtherComposition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<OtherComposition, T>
   {
-    public static global::Pure.DI.IResolver<OtherComposition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<OtherComposition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(OtherComposition composite)
     {
@@ -431,7 +431,7 @@ partial class OtherComposition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<OtherComposition, Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<OtherComposition, Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.DependentCompositionsScenario.IService Resolve(OtherComposition composition)
@@ -447,7 +447,7 @@ partial class OtherComposition
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<OtherComposition, Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<OtherComposition, Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.DependentCompositionsScenario.Program Resolve(OtherComposition composition)
diff --git a/readme/disposable-singleton.md b/readme/disposable-singleton.md
index 2103e3dd..2cb0ec73 100644
--- a/readme/disposable-singleton.md
+++ b/readme/disposable-singleton.md
@@ -83,21 +83,21 @@ classDiagram
 ```c#
 partial class Composition: System.IDisposable
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private int _disposeIndexM09D22di;
-  private Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private int _disposeIndexM09D23di;
+  private Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Dependency _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[1];
+    _disposableSingletonsM09D23di = new System.IDisposable[1];
   }
   
   internal Composition(Composition parent)
   {
-    lock (parent._disposableSingletonsM09D22di)
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _disposableSingletonsM09D22di = new System.IDisposable[1 - parent._disposeIndexM09D22di];
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _disposableSingletonsM09D23di = new System.IDisposable[1 - parent._disposeIndexM09D23di];
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
@@ -107,19 +107,19 @@ partial class Composition: System.IDisposable
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Dependency();
-                  _disposableSingletonsM09D22di[_disposeIndexM09D22di++] = _singletonM09D22di22;
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Dependency();
+                  _disposableSingletonsM09D23di[_disposeIndexM09D23di++] = _singletonM09D23di22;
               }
           }
       }
-      Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Service transientM09D22di123 = new Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Service(_singletonM09D22di22);
-      return transientM09D22di123;
+      var transientM09D23di123 = new Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.Service(_singletonM09D23di22);
+      return transientM09D23di123;
     }
   }
   #endregion
@@ -131,7 +131,7 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -140,7 +140,7 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -149,10 +149,10 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -168,10 +168,10 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -184,13 +184,13 @@ partial class Composition: System.IDisposable
   
   public void Dispose()
   {
-    lock (_disposableSingletonsM09D22di)
+    lock (_disposableSingletonsM09D23di)
     {
-      while (_disposeIndexM09D22di > 0)
+      while (_disposeIndexM09D23di > 0)
       {
         try
         {
-          _disposableSingletonsM09D22di[--_disposeIndexM09D22di].Dispose();
+          _disposableSingletonsM09D23di[--_disposeIndexM09D23di].Dispose();
         }
         catch
         {
@@ -198,7 +198,7 @@ partial class Composition: System.IDisposable
         }
       }
       
-      _singletonM09D22di22 = null;
+      _singletonM09D23di22 = null;
     }
   }
   
@@ -232,26 +232,26 @@ partial class Composition: System.IDisposable
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -264,7 +264,7 @@ partial class Composition: System.IDisposable
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.DisposableSingletonScenario.IService Resolve(Composition composition)
diff --git a/readme/enumerable.md b/readme/enumerable.md
index 234efe8e..ee469f4a 100644
--- a/readme/enumerable.md
+++ b/readme/enumerable.md
@@ -81,16 +81,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -99,26 +99,17 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      System.Collections.Generic.IEnumerable<Pure.DI.UsageTests.BCL.EnumerableScenario.IDependency> perResolveM09D22di20 = default(System.Collections.Generic.IEnumerable<Pure.DI.UsageTests.BCL.EnumerableScenario.IDependency>);
-      if (global::System.Object.ReferenceEquals(perResolveM09D22di20, null))
+      var perResolveM09D23di20 = default(System.Collections.Generic.IEnumerable<Pure.DI.UsageTests.BCL.EnumerableScenario.IDependency>);
+      System.Collections.Generic.IEnumerable<Pure.DI.UsageTests.BCL.EnumerableScenario.IDependency> LocalFunc_perResolveM09D23di20()
       {
-          lock (_disposableSingletonsM09D22di)
-          {
-              if (global::System.Object.ReferenceEquals(perResolveM09D22di20, null))
-              {
-                  System.Collections.Generic.IEnumerable<Pure.DI.UsageTests.BCL.EnumerableScenario.IDependency> LocalFunc_perResolveM09D22di20()
-                  {
-                      Pure.DI.UsageTests.BCL.EnumerableScenario.AbcDependency transientM09D22di21 = new Pure.DI.UsageTests.BCL.EnumerableScenario.AbcDependency();
-                      yield return transientM09D22di21;
-                      Pure.DI.UsageTests.BCL.EnumerableScenario.XyzDependency transientM09D22di22 = new Pure.DI.UsageTests.BCL.EnumerableScenario.XyzDependency();
-                      yield return transientM09D22di22;
-                  }
-                  perResolveM09D22di20 = LocalFunc_perResolveM09D22di20();
-              }
-          }
+          var transientM09D23di21 = new Pure.DI.UsageTests.BCL.EnumerableScenario.AbcDependency();
+          yield return transientM09D23di21;
+          var transientM09D23di22 = new Pure.DI.UsageTests.BCL.EnumerableScenario.XyzDependency();
+          yield return transientM09D23di22;
       }
-      Pure.DI.UsageTests.BCL.EnumerableScenario.Service transientM09D22di19 = new Pure.DI.UsageTests.BCL.EnumerableScenario.Service(perResolveM09D22di20);
-      return transientM09D22di19;
+      perResolveM09D23di20 = LocalFunc_perResolveM09D23di20();
+      var transientM09D23di19 = new Pure.DI.UsageTests.BCL.EnumerableScenario.Service(perResolveM09D23di20);
+      return transientM09D23di19;
     }
   }
   #endregion
@@ -130,7 +121,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -139,7 +130,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -148,10 +139,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -167,10 +158,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -217,26 +208,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.EnumerableScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.EnumerableScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.EnumerableScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.EnumerableScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -249,7 +240,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.EnumerableScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.EnumerableScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.EnumerableScenario.IService Resolve(Composition composition)
diff --git a/readme/factory.md b/readme/factory.md
index 36e43e4a..fa29efe0 100644
--- a/readme/factory.md
+++ b/readme/factory.md
@@ -88,16 +88,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -106,14 +106,14 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.FactoryScenario.Dependency transientM09D22di69;
+      Pure.DI.UsageTests.Basics.FactoryScenario.Dependency transientM09D23di69;
       {
           var dependency = new Dependency(DateTimeOffset.Now);
           dependency.Initialize();
-          transientM09D22di69 = dependency;
+          transientM09D23di69 = dependency;
       }
-      Pure.DI.UsageTests.Basics.FactoryScenario.Service transientM09D22di68 = new Pure.DI.UsageTests.Basics.FactoryScenario.Service(transientM09D22di69);
-      return transientM09D22di68;
+      var transientM09D23di68 = new Pure.DI.UsageTests.Basics.FactoryScenario.Service(transientM09D23di69);
+      return transientM09D23di68;
     }
   }
   #endregion
@@ -125,7 +125,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -134,7 +134,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -143,10 +143,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -162,10 +162,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -203,26 +203,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.FactoryScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.FactoryScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.FactoryScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.FactoryScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -235,7 +235,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.FactoryScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.FactoryScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.FactoryScenario.IService Resolve(Composition composition)
diff --git a/readme/field-injection.md b/readme/field-injection.md
index 2eecf15d..93cb60e3 100644
--- a/readme/field-injection.md
+++ b/readme/field-injection.md
@@ -70,16 +70,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -88,10 +88,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.FieldInjectionScenario.Dependency transientM09D22di71 = new Pure.DI.UsageTests.Basics.FieldInjectionScenario.Dependency();
-      Pure.DI.UsageTests.Basics.FieldInjectionScenario.Service transientM09D22di70 = new Pure.DI.UsageTests.Basics.FieldInjectionScenario.Service();
-      transientM09D22di70.DependencyVal = transientM09D22di71;
-      return transientM09D22di70;
+      var transientM09D23di71 = new Pure.DI.UsageTests.Basics.FieldInjectionScenario.Dependency();
+      var transientM09D23di70 = new Pure.DI.UsageTests.Basics.FieldInjectionScenario.Service();
+      transientM09D23di70.DependencyVal = transientM09D23di71;
+      return transientM09D23di70;
     }
   }
   #endregion
@@ -103,7 +103,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -112,7 +112,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -121,10 +121,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -140,10 +140,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -184,26 +184,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -216,7 +216,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.FieldInjectionScenario.IService Resolve(Composition composition)
diff --git a/readme/func-with-arguments.md b/readme/func-with-arguments.md
index 54c277cf..b3b4554a 100644
--- a/readme/func-with-arguments.md
+++ b/readme/func-with-arguments.md
@@ -104,20 +104,20 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Clock _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Clock _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
@@ -127,25 +127,25 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      System.Func<int, Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IDependency> transientM09D22di27 = new Func<int, IDependency>(id =>
+      var transientM09D23di27 = new Func<int, IDependency>(id =>
       {
-          if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+          if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
           {
-              lock (_disposableSingletonsM09D22di)
+              lock (_disposableSingletonsM09D23di)
               {
-                  if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+                  if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
                   {
-                      _singletonM09D22di22 = new Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Clock();
+                      _singletonM09D23di22 = new Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Clock();
                   }
               }
           }
-          Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Dependency transientM09D22di28 = new Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Dependency(_singletonM09D22di22);
-          var dependency = transientM09D22di28;
+          var transientM09D23di28 = new Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Dependency(_singletonM09D23di22);
+          var dependency = transientM09D23di28;
           dependency.Id = id;
           return dependency;
       });
-      Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Service transientM09D22di26 = new Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Service(transientM09D22di27);
-      return transientM09D22di26;
+      var transientM09D23di26 = new Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.Service(transientM09D23di27);
+      return transientM09D23di26;
     }
   }
   #endregion
@@ -157,7 +157,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -166,7 +166,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -175,10 +175,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -194,10 +194,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -243,26 +243,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -275,7 +275,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.FuncWithArgumentsScenario.IService Resolve(Composition composition)
diff --git a/readme/func.md b/readme/func.md
index 09d02e47..5ec3f989 100644
--- a/readme/func.md
+++ b/readme/func.md
@@ -74,16 +74,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -92,25 +92,16 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      System.Func<Pure.DI.UsageTests.BCL.FuncScenario.IDependency> perResolveM09D22di24 = default(System.Func<Pure.DI.UsageTests.BCL.FuncScenario.IDependency>);
-      if (global::System.Object.ReferenceEquals(perResolveM09D22di24, null))
+      var perResolveM09D23di24 = default(System.Func<Pure.DI.UsageTests.BCL.FuncScenario.IDependency>);
+      perResolveM09D23di24 = new global::System.Func<Pure.DI.UsageTests.BCL.FuncScenario.IDependency>(() =>
       {
-          lock (_disposableSingletonsM09D22di)
-          {
-              if (global::System.Object.ReferenceEquals(perResolveM09D22di24, null))
-              {
-                  perResolveM09D22di24 = new global::System.Func<Pure.DI.UsageTests.BCL.FuncScenario.IDependency>(() =>
-                  {
-                      Pure.DI.UsageTests.BCL.FuncScenario.IDependency value;
-                      Pure.DI.UsageTests.BCL.FuncScenario.Dependency transientM09D22di25 = new Pure.DI.UsageTests.BCL.FuncScenario.Dependency();
-                      value = transientM09D22di25;
-                      return value;
-                  });
-              }
-          }
-      }
-      Pure.DI.UsageTests.BCL.FuncScenario.Service transientM09D22di23 = new Pure.DI.UsageTests.BCL.FuncScenario.Service(perResolveM09D22di24);
-      return transientM09D22di23;
+          Pure.DI.UsageTests.BCL.FuncScenario.IDependency value;
+          var transientM09D23di25 = new Pure.DI.UsageTests.BCL.FuncScenario.Dependency();
+          value = transientM09D23di25;
+          return value;
+      });
+      var transientM09D23di23 = new Pure.DI.UsageTests.BCL.FuncScenario.Service(perResolveM09D23di24);
+      return transientM09D23di23;
     }
   }
   #endregion
@@ -122,7 +113,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -131,7 +122,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -140,10 +131,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -159,10 +150,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -204,26 +195,26 @@ partial class Composition
         "  FuncᐸIDependencyᐳ *--  Dependency : IDependency";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.FuncScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.FuncScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.FuncScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.FuncScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -236,7 +227,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.FuncScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.FuncScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.FuncScenario.IService Resolve(Composition composition)
diff --git a/readme/generics.md b/readme/generics.md
index b48385aa..824ddb67 100644
--- a/readme/generics.md
+++ b/readme/generics.md
@@ -87,16 +87,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -105,10 +105,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.GenericsScenario.Dependency<string> transientM09D22di74 = new Pure.DI.UsageTests.Basics.GenericsScenario.Dependency<string>();
-      Pure.DI.UsageTests.Basics.GenericsScenario.Dependency<int> transientM09D22di73 = new Pure.DI.UsageTests.Basics.GenericsScenario.Dependency<int>();
-      Pure.DI.UsageTests.Basics.GenericsScenario.Service transientM09D22di72 = new Pure.DI.UsageTests.Basics.GenericsScenario.Service(transientM09D22di73, transientM09D22di74);
-      return transientM09D22di72;
+      var transientM09D23di74 = new Pure.DI.UsageTests.Basics.GenericsScenario.Dependency<string>();
+      var transientM09D23di73 = new Pure.DI.UsageTests.Basics.GenericsScenario.Dependency<int>();
+      var transientM09D23di72 = new Pure.DI.UsageTests.Basics.GenericsScenario.Service(transientM09D23di73, transientM09D23di74);
+      return transientM09D23di72;
     }
   }
   #endregion
@@ -120,7 +120,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -129,7 +129,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -138,10 +138,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -157,10 +157,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -208,26 +208,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.GenericsScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.GenericsScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.GenericsScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.GenericsScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -240,7 +240,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.GenericsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.GenericsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.GenericsScenario.IService Resolve(Composition composition)
diff --git a/readme/injection.md b/readme/injection.md
index 50bd7051..ea137cbe 100644
--- a/readme/injection.md
+++ b/readme/injection.md
@@ -74,16 +74,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -92,13 +92,13 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.InjectionScenario.Service transientM09D22di75;
+      Pure.DI.UsageTests.Basics.InjectionScenario.Service transientM09D23di75;
       {
-          Pure.DI.UsageTests.Basics.InjectionScenario.Dependency transientM09D22di76 = new Pure.DI.UsageTests.Basics.InjectionScenario.Dependency();
-          var dependency = transientM09D22di76;
-          transientM09D22di75 = new Service(dependency);
+          var transientM09D23di76 = new Pure.DI.UsageTests.Basics.InjectionScenario.Dependency();
+          var dependency = transientM09D23di76;
+          transientM09D23di75 = new Service(dependency);
       }
-      return transientM09D22di75;
+      return transientM09D23di75;
     }
   }
   #endregion
@@ -110,7 +110,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -119,7 +119,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -128,10 +128,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -147,10 +147,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -188,26 +188,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.InjectionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.InjectionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.InjectionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.InjectionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -220,7 +220,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.InjectionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.InjectionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.InjectionScenario.IService Resolve(Composition composition)
diff --git a/readme/interception.md b/readme/interception.md
index 3ae85b45..3568677c 100644
--- a/readme/interception.md
+++ b/readme/interception.md
@@ -83,16 +83,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -101,8 +101,8 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Interception.InterceptionScenario.Service transientM09D22di122 = new Pure.DI.UsageTests.Interception.InterceptionScenario.Service();
-      return OnDependencyInjection<Pure.DI.UsageTests.Interception.InterceptionScenario.IService>(transientM09D22di122, null, Pure.DI.Lifetime.Transient);
+      var transientM09D23di122 = new Pure.DI.UsageTests.Interception.InterceptionScenario.Service();
+      return OnDependencyInjection<Pure.DI.UsageTests.Interception.InterceptionScenario.IService>(transientM09D23di122, null, Pure.DI.Lifetime.Transient);
     }
   }
   #endregion
@@ -114,7 +114,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -123,7 +123,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -132,10 +132,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -151,10 +151,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -189,26 +189,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Interception.InterceptionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Interception.InterceptionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Interception.InterceptionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Interception.InterceptionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -221,7 +221,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Interception.InterceptionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Interception.InterceptionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Interception.InterceptionScenario.IService Resolve(Composition composition)
diff --git a/readme/lazy.md b/readme/lazy.md
index e560cf71..3e8f3932 100644
--- a/readme/lazy.md
+++ b/readme/lazy.md
@@ -73,16 +73,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -91,31 +91,22 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      System.Func<Pure.DI.UsageTests.BCL.LazyScenario.IDependency> perResolveM09D22di20 = default(System.Func<Pure.DI.UsageTests.BCL.LazyScenario.IDependency>);
-      System.Lazy<Pure.DI.UsageTests.BCL.LazyScenario.IDependency> transientM09D22di31;
+      var perResolveM09D23di20 = default(System.Func<Pure.DI.UsageTests.BCL.LazyScenario.IDependency>);
+      System.Lazy<Pure.DI.UsageTests.BCL.LazyScenario.IDependency> transientM09D23di31;
       {
           global::System.Func<Pure.DI.UsageTests.BCL.LazyScenario.IDependency> func;
-          if (global::System.Object.ReferenceEquals(perResolveM09D22di20, null))
+          perResolveM09D23di20 = new global::System.Func<Pure.DI.UsageTests.BCL.LazyScenario.IDependency>(() =>
           {
-              lock (_disposableSingletonsM09D22di)
-              {
-                  if (global::System.Object.ReferenceEquals(perResolveM09D22di20, null))
-                  {
-                      perResolveM09D22di20 = new global::System.Func<Pure.DI.UsageTests.BCL.LazyScenario.IDependency>(() =>
-                      {
-                          Pure.DI.UsageTests.BCL.LazyScenario.IDependency value;
-                          Pure.DI.UsageTests.BCL.LazyScenario.Dependency transientM09D22di32 = new Pure.DI.UsageTests.BCL.LazyScenario.Dependency();
-                          value = transientM09D22di32;
-                          return value;
-                      });
-                  }
-              }
-          }
-          func = perResolveM09D22di20;
-          transientM09D22di31 = new global::System.Lazy<Pure.DI.UsageTests.BCL.LazyScenario.IDependency>(func, true);
+              Pure.DI.UsageTests.BCL.LazyScenario.IDependency value;
+              var transientM09D23di32 = new Pure.DI.UsageTests.BCL.LazyScenario.Dependency();
+              value = transientM09D23di32;
+              return value;
+          });
+          func = perResolveM09D23di20;
+          transientM09D23di31 = new global::System.Lazy<Pure.DI.UsageTests.BCL.LazyScenario.IDependency>(func, true);
       }
-      Pure.DI.UsageTests.BCL.LazyScenario.Service transientM09D22di30 = new Pure.DI.UsageTests.BCL.LazyScenario.Service(transientM09D22di31);
-      return transientM09D22di30;
+      var transientM09D23di30 = new Pure.DI.UsageTests.BCL.LazyScenario.Service(transientM09D23di31);
+      return transientM09D23di30;
     }
   }
   #endregion
@@ -127,7 +118,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -136,7 +127,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -145,10 +136,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -164,10 +155,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -211,26 +202,26 @@ partial class Composition
         "  FuncᐸIDependencyᐳ *--  Dependency : IDependency";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.LazyScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.LazyScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.LazyScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.LazyScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -243,7 +234,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.LazyScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.LazyScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.LazyScenario.IService Resolve(Composition composition)
diff --git a/readme/member-ordinal-attribute.md b/readme/member-ordinal-attribute.md
index 9cf6ee51..7603b286 100644
--- a/readme/member-ordinal-attribute.md
+++ b/readme/member-ordinal-attribute.md
@@ -95,10 +95,10 @@ classDiagram
 ```c#
 partial class PersonComposition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private readonly int _argM09D22dipersonId;
-  private readonly string _argM09D22dipersonName;
-  private readonly System.DateTime _argM09D22dipersonBirthday;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private readonly int _argM09D23dipersonId;
+  private readonly string _argM09D23dipersonName;
+  private readonly System.DateTime _argM09D23dipersonBirthday;
   
   public PersonComposition(int personId, string personName, System.DateTime personBirthday)
   {
@@ -107,18 +107,18 @@ partial class PersonComposition
       throw new global::System.ArgumentNullException("personName");
     }
     
-    _argM09D22dipersonId = personId;
-    _argM09D22dipersonName = personName;
-    _argM09D22dipersonBirthday = personBirthday;
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _argM09D23dipersonId = personId;
+    _argM09D23dipersonName = personName;
+    _argM09D23dipersonBirthday = personBirthday;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal PersonComposition(PersonComposition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    _argM09D22dipersonId = parent._argM09D22dipersonId;
-    _argM09D22dipersonName = parent._argM09D22dipersonName;
-    _argM09D22dipersonBirthday = parent._argM09D22dipersonBirthday;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    _argM09D23dipersonId = parent._argM09D23dipersonId;
+    _argM09D23dipersonName = parent._argM09D23dipersonName;
+    _argM09D23dipersonBirthday = parent._argM09D23dipersonBirthday;
   }
   
   #region Composition Roots
@@ -127,11 +127,11 @@ partial class PersonComposition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.Person transientM09D22di5 = new Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.Person();
-      transientM09D22di5.Id = _argM09D22dipersonId;
-      transientM09D22di5.FirstName = _argM09D22dipersonName;
-      transientM09D22di5.Birthday = _argM09D22dipersonBirthday;
-      return transientM09D22di5;
+      var transientM09D23di5 = new Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.Person();
+      transientM09D23di5.Id = _argM09D23dipersonId;
+      transientM09D23di5.FirstName = _argM09D23dipersonName;
+      transientM09D23di5.Birthday = _argM09D23dipersonBirthday;
+      return transientM09D23di5;
     }
   }
   #endregion
@@ -143,7 +143,7 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -152,7 +152,7 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -161,10 +161,10 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -180,10 +180,10 @@ partial class PersonComposition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -224,26 +224,26 @@ partial class PersonComposition
         "  PersonComposition ..> Person : IPerson Person";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>[] _bucketsM09D23di;
   
   static PersonComposition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>(typeof(Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<PersonComposition, object>>(typeof(Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<PersonComposition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<PersonComposition, T>
   {
-    public static global::Pure.DI.IResolver<PersonComposition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<PersonComposition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(PersonComposition composite)
     {
@@ -256,7 +256,7 @@ partial class PersonComposition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<PersonComposition, Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<PersonComposition, Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Attributes.MemberOrdinalAttributeScenario.IPerson Resolve(PersonComposition composition)
diff --git a/readme/method-injection.md b/readme/method-injection.md
index 1ff8160b..81ab7330 100644
--- a/readme/method-injection.md
+++ b/readme/method-injection.md
@@ -71,16 +71,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -89,10 +89,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.MethodInjectionScenario.Dependency transientM09D22di78 = new Pure.DI.UsageTests.Basics.MethodInjectionScenario.Dependency();
-      Pure.DI.UsageTests.Basics.MethodInjectionScenario.Service transientM09D22di77 = new Pure.DI.UsageTests.Basics.MethodInjectionScenario.Service();
-      transientM09D22di77.SetDependency(transientM09D22di78);
-      return transientM09D22di77;
+      var transientM09D23di78 = new Pure.DI.UsageTests.Basics.MethodInjectionScenario.Dependency();
+      var transientM09D23di77 = new Pure.DI.UsageTests.Basics.MethodInjectionScenario.Service();
+      transientM09D23di77.SetDependency(transientM09D23di78);
+      return transientM09D23di77;
     }
   }
   #endregion
@@ -104,7 +104,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -113,7 +113,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -122,10 +122,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -141,10 +141,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -185,26 +185,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -217,7 +217,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.MethodInjectionScenario.IService Resolve(Composition composition)
diff --git a/readme/multi-contract-bindings.md b/readme/multi-contract-bindings.md
index 91885747..31c1ce71 100644
--- a/readme/multi-contract-bindings.md
+++ b/readme/multi-contract-bindings.md
@@ -71,16 +71,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -89,10 +89,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Dependency transientM09D22di81 = new Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Dependency transientM09D22di80 = new Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Service transientM09D22di79 = new Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Service(transientM09D22di80, transientM09D22di81);
-      return transientM09D22di79;
+      var transientM09D23di81 = new Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Dependency();
+      var transientM09D23di80 = new Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Dependency();
+      var transientM09D23di79 = new Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.Service(transientM09D23di80, transientM09D23di81);
+      return transientM09D23di79;
     }
   }
   #endregion
@@ -104,7 +104,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -113,7 +113,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -122,10 +122,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -141,10 +141,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -189,26 +189,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -221,7 +221,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.MultiContractBindingsScenario.IService Resolve(Composition composition)
diff --git a/readme/oncannotresolve-hint.md b/readme/oncannotresolve-hint.md
index 493c1c80..7fe4f5e8 100644
--- a/readme/oncannotresolve-hint.md
+++ b/readme/oncannotresolve-hint.md
@@ -103,16 +103,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -121,10 +121,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      string transientM09D22di106 = OnCannotResolve<string>(null, Pure.DI.Lifetime.Transient);
-      Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.Dependency transientM09D22di105 = new Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.Dependency(transientM09D22di106);
-      Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.Service transientM09D22di104 = new Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.Service(transientM09D22di105);
-      return transientM09D22di104;
+      var transientM09D23di106 = OnCannotResolve<string>(null, Pure.DI.Lifetime.Transient);
+      var transientM09D23di105 = new Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.Dependency(transientM09D23di106);
+      var transientM09D23di104 = new Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.Service(transientM09D23di105);
+      return transientM09D23di104;
     }
   }
   #endregion
@@ -136,7 +136,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -145,7 +145,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -154,10 +154,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -173,10 +173,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -221,26 +221,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -253,7 +253,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Hints.OnCannotResolveHintScenario.IService Resolve(Composition composition)
diff --git a/readme/ondependencyinjection-hint.md b/readme/ondependencyinjection-hint.md
index 72f88af2..a1fc1f70 100644
--- a/readme/ondependencyinjection-hint.md
+++ b/readme/ondependencyinjection-hint.md
@@ -97,16 +97,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -115,9 +115,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.Dependency transientM09D22di108 = new Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.Dependency();
-      Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.Service transientM09D22di107 = new Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.Service(OnDependencyInjection<Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IDependency>(transientM09D22di108, null, Pure.DI.Lifetime.Transient));
-      return transientM09D22di107;
+      var transientM09D23di108 = new Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.Dependency();
+      var transientM09D23di107 = new Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.Service(OnDependencyInjection<Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IDependency>(transientM09D23di108, null, Pure.DI.Lifetime.Transient));
+      return transientM09D23di107;
     }
   }
   #endregion
@@ -129,7 +129,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -138,7 +138,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -147,10 +147,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -166,10 +166,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -212,26 +212,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -244,7 +244,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Hints.OnDependencyInjectionHintScenario.IService Resolve(Composition composition)
diff --git a/readme/onnewinstance-hint.md b/readme/onnewinstance-hint.md
index 1c6ee7d9..6433d954 100644
--- a/readme/onnewinstance-hint.md
+++ b/readme/onnewinstance-hint.md
@@ -99,16 +99,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -117,11 +117,11 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Dependency transientM09D22di110 = new Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Dependency();
-      OnNewInstance<Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Dependency>(ref transientM09D22di110, null, Pure.DI.Lifetime.Transient);
-      Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Service transientM09D22di109 = new Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Service(transientM09D22di110);
-      OnNewInstance<Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Service>(ref transientM09D22di109, null, Pure.DI.Lifetime.Transient);
-      return transientM09D22di109;
+      var transientM09D23di110 = new Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Dependency();
+      OnNewInstance<Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Dependency>(ref transientM09D23di110, null, Pure.DI.Lifetime.Transient);
+      var transientM09D23di109 = new Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Service(transientM09D23di110);
+      OnNewInstance<Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.Service>(ref transientM09D23di109, null, Pure.DI.Lifetime.Transient);
+      return transientM09D23di109;
     }
   }
   #endregion
@@ -133,7 +133,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -142,7 +142,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -151,10 +151,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -170,10 +170,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -216,26 +216,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -248,7 +248,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Hints.OnNewInstanceHintScenario.IService Resolve(Composition composition)
diff --git a/readme/overriding-the-bcl-binding.md b/readme/overriding-the-bcl-binding.md
index d4bb353a..bcc4ec2f 100644
--- a/readme/overriding-the-bcl-binding.md
+++ b/readme/overriding-the-bcl-binding.md
@@ -73,16 +73,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -91,14 +91,14 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IDependency[] transientM09D22di34 = new IDependency[]
+      var transientM09D23di34 = new IDependency[]
       {
           new AbcDependency(),
           new XyzDependency(),
           new AbcDependency()
       };
-      Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.Service transientM09D22di33 = new Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.Service(transientM09D22di34);
-      return transientM09D22di33;
+      var transientM09D23di33 = new Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.Service(transientM09D23di34);
+      return transientM09D23di33;
     }
   }
   #endregion
@@ -110,7 +110,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -119,7 +119,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -128,10 +128,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -147,10 +147,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -184,26 +184,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -216,7 +216,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.OverridingBclBindingScenario.IService Resolve(Composition composition)
diff --git a/readme/partial-class.md b/readme/partial-class.md
index e3fc2b92..6c8bb4f0 100644
--- a/readme/partial-class.md
+++ b/readme/partial-class.md
@@ -70,16 +70,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -88,9 +88,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.PartialClassScenario.Dependency transientM09D22di83 = new Pure.DI.UsageTests.Basics.PartialClassScenario.Dependency();
-      Pure.DI.UsageTests.Basics.PartialClassScenario.Service transientM09D22di82 = new Pure.DI.UsageTests.Basics.PartialClassScenario.Service(transientM09D22di83);
-      return transientM09D22di82;
+      var transientM09D23di83 = new Pure.DI.UsageTests.Basics.PartialClassScenario.Dependency();
+      var transientM09D23di82 = new Pure.DI.UsageTests.Basics.PartialClassScenario.Service(transientM09D23di83);
+      return transientM09D23di82;
     }
   }
   #endregion
@@ -102,7 +102,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -111,7 +111,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -120,10 +120,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -139,10 +139,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -182,26 +182,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.PartialClassScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.PartialClassScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.PartialClassScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.PartialClassScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -214,7 +214,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.PartialClassScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.PartialClassScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.PartialClassScenario.IService Resolve(Composition composition)
diff --git a/readme/perresolve.md b/readme/perresolve.md
index 276473c8..a2bf8c37 100644
--- a/readme/perresolve.md
+++ b/readme/perresolve.md
@@ -79,16 +79,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -97,19 +97,19 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Dependency perResolveM09D22di29 = default(Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Dependency);
-      if (global::System.Object.ReferenceEquals(perResolveM09D22di29, null))
+      var perResolveM09D23di29 = default(Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Dependency);
+      if (global::System.Object.ReferenceEquals(perResolveM09D23di29, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(perResolveM09D22di29, null))
+              if (global::System.Object.ReferenceEquals(perResolveM09D23di29, null))
               {
-                  perResolveM09D22di29 = new Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Dependency();
+                  perResolveM09D23di29 = new Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Dependency();
               }
           }
       }
-      Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Service transientM09D22di124 = new Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Service(perResolveM09D22di29, perResolveM09D22di29);
-      return transientM09D22di124;
+      var transientM09D23di124 = new Pure.DI.UsageTests.Lifetimes.PerResolveScenario.Service(perResolveM09D23di29, perResolveM09D23di29);
+      return transientM09D23di124;
     }
   }
   #endregion
@@ -121,7 +121,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -130,7 +130,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -139,10 +139,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -158,10 +158,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -202,26 +202,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -234,7 +234,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.PerResolveScenario.IService Resolve(Composition composition)
diff --git a/readme/property-injection.md b/readme/property-injection.md
index af55e89e..8705c9c4 100644
--- a/readme/property-injection.md
+++ b/readme/property-injection.md
@@ -68,16 +68,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -86,10 +86,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.PropertyInjectionScenario.Dependency transientM09D22di85 = new Pure.DI.UsageTests.Basics.PropertyInjectionScenario.Dependency();
-      Pure.DI.UsageTests.Basics.PropertyInjectionScenario.Service transientM09D22di84 = new Pure.DI.UsageTests.Basics.PropertyInjectionScenario.Service();
-      transientM09D22di84.Dependency = transientM09D22di85;
-      return transientM09D22di84;
+      var transientM09D23di85 = new Pure.DI.UsageTests.Basics.PropertyInjectionScenario.Dependency();
+      var transientM09D23di84 = new Pure.DI.UsageTests.Basics.PropertyInjectionScenario.Service();
+      transientM09D23di84.Dependency = transientM09D23di85;
+      return transientM09D23di84;
     }
   }
   #endregion
@@ -101,7 +101,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -110,7 +110,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -119,10 +119,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -138,10 +138,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -182,26 +182,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -214,7 +214,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.PropertyInjectionScenario.IService Resolve(Composition composition)
diff --git a/readme/required-properties-or-fields.md b/readme/required-properties-or-fields.md
index bc8cc237..6ed0be70 100644
--- a/readme/required-properties-or-fields.md
+++ b/readme/required-properties-or-fields.md
@@ -78,8 +78,8 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private readonly string _argM09D22diname;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private readonly string _argM09D23diname;
   
   public Composition(string name)
   {
@@ -88,14 +88,14 @@ partial class Composition
       throw new global::System.ArgumentNullException("name");
     }
     
-    _argM09D22diname = name;
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _argM09D23diname = name;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    _argM09D22diname = parent._argM09D22diname;
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    _argM09D23diname = parent._argM09D23diname;
   }
   
   #region Composition Roots
@@ -104,13 +104,13 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.Dependency transientM09D22di88 = new Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.Dependency();
-      Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.Service transientM09D22di86 = new Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.Service()
+      var transientM09D23di88 = new Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.Dependency();
+      var transientM09D23di86 = new Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.Service()
       {
-          ServiceNameField = _argM09D22diname,
-          Dependency = transientM09D22di88
+          ServiceNameField = _argM09D23diname,
+          Dependency = transientM09D23di88
       };
-      return transientM09D22di86;
+      return transientM09D23di86;
     }
   }
   #endregion
@@ -122,7 +122,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -131,7 +131,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -140,10 +140,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -159,10 +159,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -206,26 +206,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -238,7 +238,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.RequiredPropertiesOrFieldsScenario.IService Resolve(Composition composition)
diff --git a/readme/resolve-hint.md b/readme/resolve-hint.md
index 9904c8da..bf8696e1 100644
--- a/readme/resolve-hint.md
+++ b/readme/resolve-hint.md
@@ -65,16 +65,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -83,8 +83,8 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Hints.ResolveHintScenario.Dependency transientM09D22di111 = new Pure.DI.UsageTests.Hints.ResolveHintScenario.Dependency();
-      return transientM09D22di111;
+      var transientM09D23di111 = new Pure.DI.UsageTests.Hints.ResolveHintScenario.Dependency();
+      return transientM09D23di111;
     }
   }
   
@@ -93,9 +93,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Hints.ResolveHintScenario.Dependency transientM09D22di113 = new Pure.DI.UsageTests.Hints.ResolveHintScenario.Dependency();
-      Pure.DI.UsageTests.Hints.ResolveHintScenario.Service transientM09D22di112 = new Pure.DI.UsageTests.Hints.ResolveHintScenario.Service(transientM09D22di113);
-      return transientM09D22di112;
+      var transientM09D23di113 = new Pure.DI.UsageTests.Hints.ResolveHintScenario.Dependency();
+      var transientM09D23di112 = new Pure.DI.UsageTests.Hints.ResolveHintScenario.Service(transientM09D23di113);
+      return transientM09D23di112;
     }
   }
   #endregion
diff --git a/readme/resolve-methods.md b/readme/resolve-methods.md
index 3ac54adb..379d8319 100644
--- a/readme/resolve-methods.md
+++ b/readme/resolve-methods.md
@@ -49,7 +49,7 @@ classDiagram
   class Composition {
     +IDependency DependencySingleton
     +IService OtherService
-    -IService RootM09D22di_0002
+    -IService RootM09D23di_0002
     + T ResolveᐸTᐳ()
     + T ResolveᐸTᐳ(object? tag)
     + object Resolve(Type type)
@@ -75,7 +75,7 @@ classDiagram
   }
   Service *--  Dependency : IDependency
   Composition ..> Dependency : IDependency DependencySingleton
-  Composition ..> Service : IService RootM09D22di_0002
+  Composition ..> Service : IService RootM09D23di_0002
   Composition ..> OtherService : "Other" IService OtherService
 ```
 
@@ -87,16 +87,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -105,8 +105,8 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.ResolveScenario.Dependency transientM09D22di89 = new Pure.DI.UsageTests.Basics.ResolveScenario.Dependency();
-      return transientM09D22di89;
+      var transientM09D23di89 = new Pure.DI.UsageTests.Basics.ResolveScenario.Dependency();
+      return transientM09D23di89;
     }
   }
   
@@ -115,19 +115,19 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.ResolveScenario.OtherService transientM09D22di92 = new Pure.DI.UsageTests.Basics.ResolveScenario.OtherService();
-      return transientM09D22di92;
+      var transientM09D23di92 = new Pure.DI.UsageTests.Basics.ResolveScenario.OtherService();
+      return transientM09D23di92;
     }
   }
   
-  private Pure.DI.UsageTests.Basics.ResolveScenario.IService RootM09D22di_0002
+  private Pure.DI.UsageTests.Basics.ResolveScenario.IService RootM09D23di_0002
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.ResolveScenario.Dependency transientM09D22di91 = new Pure.DI.UsageTests.Basics.ResolveScenario.Dependency();
-      Pure.DI.UsageTests.Basics.ResolveScenario.Service transientM09D22di90 = new Pure.DI.UsageTests.Basics.ResolveScenario.Service(transientM09D22di91);
-      return transientM09D22di90;
+      var transientM09D23di91 = new Pure.DI.UsageTests.Basics.ResolveScenario.Dependency();
+      var transientM09D23di90 = new Pure.DI.UsageTests.Basics.ResolveScenario.Service(transientM09D23di91);
+      return transientM09D23di90;
     }
   }
   #endregion
@@ -139,7 +139,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -148,7 +148,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -157,10 +157,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -176,10 +176,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -197,7 +197,7 @@ partial class Composition
         "  class Composition {\n" +
           "    +IDependency DependencySingleton\n" +
           "    +IService OtherService\n" +
-          "    -IService RootM09D22di_0002\n" +
+          "    -IService RootM09D23di_0002\n" +
           "    + T ResolveᐸTᐳ()\n" +
           "    + T ResolveᐸTᐳ(object? tag)\n" +
           "    + object Resolve(Type type)\n" +
@@ -223,33 +223,33 @@ partial class Composition
         "  }\n" +
         "  Service *--  Dependency : IDependency\n" +
         "  Composition ..> Dependency : IDependency DependencySingleton\n" +
-        "  Composition ..> Service : IService RootM09D22di_0002\n" +
+        "  Composition ..> Service : IService RootM09D23di_0002\n" +
         "  Composition ..> OtherService : \"Other\" IService OtherService";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.ResolveScenario.IDependency>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.ResolveScenario.IService>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.ResolveScenario.IDependency>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.ResolveScenario.IService>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ResolveScenario.IDependency), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ResolveScenario.IService), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ResolveScenario.IDependency), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.ResolveScenario.IService), valResolverM09D23di_0001)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -262,7 +262,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ResolveScenario.IDependency>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ResolveScenario.IDependency>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.ResolveScenario.IDependency Resolve(Composition composition)
@@ -278,19 +278,19 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ResolveScenario.IService>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.ResolveScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.ResolveScenario.IService Resolve(Composition composition)
     {
-      return composition.RootM09D22di_0002;
+      return composition.RootM09D23di_0002;
     }
     
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.ResolveScenario.IService ResolveByTag(Composition composition, object tag)
     {
       if (Equals(tag, "Other")) return composition.OtherService;
-      if (Equals(tag, null)) return composition.RootM09D22di_0002;
+      if (Equals(tag, null)) return composition.RootM09D23di_0002;
       throw new global::System.InvalidOperationException($"Cannot resolve composition root \"{tag}\" of type Pure.DI.UsageTests.Basics.ResolveScenario.IService.");
     }
   }
diff --git a/readme/root-arguments.md b/readme/root-arguments.md
index 84017fc4..5c417457 100644
--- a/readme/root-arguments.md
+++ b/readme/root-arguments.md
@@ -104,25 +104,25 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public Pure.DI.UsageTests.Basics.RootArgumentsScenario.IService CreateService(string serviceName, int id, string dependencyName)
   {
-    Pure.DI.UsageTests.Basics.RootArgumentsScenario.Dependency transientM09D22di95 = new Pure.DI.UsageTests.Basics.RootArgumentsScenario.Dependency(id, dependencyName);
-    Pure.DI.UsageTests.Basics.RootArgumentsScenario.Service transientM09D22di93 = new Pure.DI.UsageTests.Basics.RootArgumentsScenario.Service(serviceName, transientM09D22di95);
-    return transientM09D22di93;
+    var transientM09D23di95 = new Pure.DI.UsageTests.Basics.RootArgumentsScenario.Dependency(id, dependencyName);
+    var transientM09D23di93 = new Pure.DI.UsageTests.Basics.RootArgumentsScenario.Service(serviceName, transientM09D23di95);
+    return transientM09D23di93;
   }
   #endregion
   
diff --git a/readme/scope.md b/readme/scope.md
index 43513e7e..3de9954e 100644
--- a/readme/scope.md
+++ b/readme/scope.md
@@ -128,21 +128,21 @@ classDiagram
 ```c#
 partial class Composition: System.IDisposable
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private int _disposeIndexM09D22di;
-  private Pure.DI.UsageTests.Lifetimes.ScopeScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private int _disposeIndexM09D23di;
+  private Pure.DI.UsageTests.Lifetimes.ScopeScenario.Dependency _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[1];
+    _disposableSingletonsM09D23di = new System.IDisposable[1];
   }
   
   internal Composition(Composition parent)
   {
-    lock (parent._disposableSingletonsM09D22di)
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _disposableSingletonsM09D22di = new System.IDisposable[1 - parent._disposeIndexM09D22di];
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _disposableSingletonsM09D23di = new System.IDisposable[1 - parent._disposeIndexM09D23di];
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
@@ -152,19 +152,19 @@ partial class Composition: System.IDisposable
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.Lifetimes.ScopeScenario.Dependency();
-                  _disposableSingletonsM09D22di[_disposeIndexM09D22di++] = _singletonM09D22di22;
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.Lifetimes.ScopeScenario.Dependency();
+                  _disposableSingletonsM09D23di[_disposeIndexM09D23di++] = _singletonM09D23di22;
               }
           }
       }
-      Pure.DI.UsageTests.Lifetimes.ScopeScenario.Service transientM09D22di125 = new Pure.DI.UsageTests.Lifetimes.ScopeScenario.Service(_singletonM09D22di22);
-      return transientM09D22di125;
+      var transientM09D23di125 = new Pure.DI.UsageTests.Lifetimes.ScopeScenario.Service(_singletonM09D23di22);
+      return transientM09D23di125;
     }
   }
   
@@ -173,9 +173,9 @@ partial class Composition: System.IDisposable
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Lifetimes.ScopeScenario.Composition transientM09D22di127 = this;
-      Pure.DI.UsageTests.Lifetimes.ScopeScenario.Session transientM09D22di126 = new Pure.DI.UsageTests.Lifetimes.ScopeScenario.Session(transientM09D22di127);
-      return transientM09D22di126;
+      var transientM09D23di127 = this;
+      var transientM09D23di126 = new Pure.DI.UsageTests.Lifetimes.ScopeScenario.Session(transientM09D23di127);
+      return transientM09D23di126;
     }
   }
   #endregion
@@ -187,7 +187,7 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -196,7 +196,7 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -205,10 +205,10 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -224,10 +224,10 @@ partial class Composition: System.IDisposable
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -240,13 +240,13 @@ partial class Composition: System.IDisposable
   
   public void Dispose()
   {
-    lock (_disposableSingletonsM09D22di)
+    lock (_disposableSingletonsM09D23di)
     {
-      while (_disposeIndexM09D22di > 0)
+      while (_disposeIndexM09D23di > 0)
       {
         try
         {
-          _disposableSingletonsM09D22di[--_disposeIndexM09D22di].Dispose();
+          _disposableSingletonsM09D23di[--_disposeIndexM09D23di].Dispose();
         }
         catch
         {
@@ -254,7 +254,7 @@ partial class Composition: System.IDisposable
         }
       }
       
-      _singletonM09D22di22 = null;
+      _singletonM09D23di22 = null;
     }
   }
   
@@ -299,29 +299,29 @@ partial class Composition: System.IDisposable
         "  Composition ..> Session : ISession Session";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession), valResolverM09D23di_0001)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -334,7 +334,7 @@ partial class Composition: System.IDisposable
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.ScopeScenario.IService Resolve(Composition composition)
@@ -350,7 +350,7 @@ partial class Composition: System.IDisposable
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.ScopeScenario.ISession Resolve(Composition composition)
diff --git a/readme/service-collection.md b/readme/service-collection.md
index 343f6b80..6bfdba18 100644
--- a/readme/service-collection.md
+++ b/readme/service-collection.md
@@ -75,8 +75,8 @@ service.Dependency.ShouldBe(dependency);
 ```mermaid
 classDiagram
   class Composition {
-    -IDependency RootM09D22di_0001
-    -IService RootM09D22di_0002
+    -IDependency RootM09D23di_0001
+    -IService RootM09D23di_0002
     + T ResolveᐸTᐳ()
     + T ResolveᐸTᐳ(object? tag)
     + object Resolve(Type type)
@@ -97,8 +97,8 @@ classDiagram
     <<abstract>>
   }
   Service o--  "Singleton" Dependency : IDependency
-  Composition ..> Dependency : IDependency RootM09D22di_0001
-  Composition ..> Service : IService RootM09D22di_0002
+  Composition ..> Dependency : IDependency RootM09D23di_0001
+  Composition ..> Service : IService RootM09D23di_0002
 ```
 
 </details>
@@ -109,60 +109,60 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
   #region Composition Roots
-  private Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency RootM09D22di_0001
+  private Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency RootM09D23di_0001
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency();
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency();
               }
           }
       }
-      return _singletonM09D22di22;
+      return _singletonM09D23di22;
     }
   }
   
-  private Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService RootM09D22di_0002
+  private Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService RootM09D23di_0002
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency();
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency();
               }
           }
       }
-      Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Service transientM09D22di35 = new Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Service(_singletonM09D22di22);
-      return transientM09D22di35;
+      var transientM09D23di35 = new Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Service(_singletonM09D23di22);
+      return transientM09D23di35;
     }
   }
   #endregion
@@ -174,7 +174,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -183,7 +183,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -192,10 +192,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -211,10 +211,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -230,8 +230,8 @@ partial class Composition
     return
       "classDiagram\n" +
         "  class Composition {\n" +
-          "    -IDependency RootM09D22di_0001\n" +
-          "    -IService RootM09D22di_0002\n" +
+          "    -IDependency RootM09D23di_0001\n" +
+          "    -IService RootM09D23di_0002\n" +
           "    + T ResolveᐸTᐳ()\n" +
           "    + T ResolveᐸTᐳ(object? tag)\n" +
           "    + object Resolve(Type type)\n" +
@@ -252,28 +252,28 @@ partial class Composition
           "    <<abstract>>\n" +
         "  }\n" +
         "  Service o--  \"Singleton\" Dependency : IDependency\n" +
-        "  Composition ..> Dependency : IDependency RootM09D22di_0001\n" +
-        "  Composition ..> Service : IService RootM09D22di_0002";
+        "  Composition ..> Dependency : IDependency RootM09D23di_0001\n" +
+        "  Composition ..> Service : IService RootM09D23di_0002";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    OnNewRoot<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency>(valResolverM09D22di_0000, "RootM09D22di_0001", null, Pure.DI.Lifetime.Singleton);
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    OnNewRoot<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Service>(valResolverM09D22di_0001, "RootM09D22di_0002", null, Pure.DI.Lifetime.Transient);
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    OnNewRoot<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Dependency>(valResolverM09D23di_0000, "RootM09D23di_0001", null, Pure.DI.Lifetime.Singleton);
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    OnNewRoot<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.Service>(valResolverM09D23di_0001, "RootM09D23di_0002", null, Pure.DI.Lifetime.Transient);
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService), valResolverM09D23di_0001)
       });
   }
   
@@ -281,9 +281,9 @@ partial class Composition
   private static partial void OnNewRoot<TContract, T>(global::Pure.DI.IResolver<Composition, TContract> resolver, string name, object? tag, global::Pure.DI.Lifetime lifetime);
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -296,34 +296,34 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency Resolve(Composition composition)
     {
-      return composition.RootM09D22di_0001;
+      return composition.RootM09D23di_0001;
     }
     
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency ResolveByTag(Composition composition, object tag)
     {
-      if (Equals(tag, null)) return composition.RootM09D22di_0001;
+      if (Equals(tag, null)) return composition.RootM09D23di_0001;
       throw new global::System.InvalidOperationException($"Cannot resolve composition root \"{tag}\" of type Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IDependency.");
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService Resolve(Composition composition)
     {
-      return composition.RootM09D22di_0002;
+      return composition.RootM09D23di_0002;
     }
     
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService ResolveByTag(Composition composition, object tag)
     {
-      if (Equals(tag, null)) return composition.RootM09D22di_0002;
+      if (Equals(tag, null)) return composition.RootM09D23di_0002;
       throw new global::System.InvalidOperationException($"Cannot resolve composition root \"{tag}\" of type Pure.DI.UsageTests.BCL.ServiceCollectionScenario.IService.");
     }
   }
diff --git a/readme/service-provider.md b/readme/service-provider.md
index 157d5f34..a1df1f11 100644
--- a/readme/service-provider.md
+++ b/readme/service-provider.md
@@ -50,8 +50,8 @@ service.Dependency.ShouldBe(dependency);
 ```mermaid
 classDiagram
   class ServiceProvider {
-    -IDependency RootM09D22di_0001
-    -IService RootM09D22di_0002
+    -IDependency RootM09D23di_0001
+    -IService RootM09D23di_0002
     + T ResolveᐸTᐳ()
     + T ResolveᐸTᐳ(object? tag)
     + object GetService(Type type)
@@ -72,8 +72,8 @@ classDiagram
     <<abstract>>
   }
   Service o--  "Singleton" Dependency : IDependency
-  ServiceProvider ..> Dependency : IDependency RootM09D22di_0001
-  ServiceProvider ..> Service : IService RootM09D22di_0002
+  ServiceProvider ..> Dependency : IDependency RootM09D23di_0001
+  ServiceProvider ..> Service : IService RootM09D23di_0002
 ```
 
 </details>
@@ -84,60 +84,60 @@ classDiagram
 ```c#
 partial class ServiceProvider
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.UsageTests.BCL.ServiceProviderScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.UsageTests.BCL.ServiceProviderScenario.Dependency _singletonM09D23di22;
   
   public ServiceProvider()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal ServiceProvider(ServiceProvider parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
   #region Composition Roots
-  private Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency RootM09D22di_0001
+  private Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency RootM09D23di_0001
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.BCL.ServiceProviderScenario.Dependency();
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.BCL.ServiceProviderScenario.Dependency();
               }
           }
       }
-      return _singletonM09D22di22;
+      return _singletonM09D23di22;
     }
   }
   
-  private Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService RootM09D22di_0002
+  private Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService RootM09D23di_0002
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.BCL.ServiceProviderScenario.Dependency();
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.BCL.ServiceProviderScenario.Dependency();
               }
           }
       }
-      Pure.DI.UsageTests.BCL.ServiceProviderScenario.Service transientM09D22di36 = new Pure.DI.UsageTests.BCL.ServiceProviderScenario.Service(_singletonM09D22di22);
-      return transientM09D22di36;
+      var transientM09D23di36 = new Pure.DI.UsageTests.BCL.ServiceProviderScenario.Service(_singletonM09D23di22);
+      return transientM09D23di36;
     }
   }
   #endregion
@@ -149,7 +149,7 @@ partial class ServiceProvider
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -158,7 +158,7 @@ partial class ServiceProvider
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -167,10 +167,10 @@ partial class ServiceProvider
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object GetService(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -186,10 +186,10 @@ partial class ServiceProvider
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -205,8 +205,8 @@ partial class ServiceProvider
     return
       "classDiagram\n" +
         "  class ServiceProvider {\n" +
-          "    -IDependency RootM09D22di_0001\n" +
-          "    -IService RootM09D22di_0002\n" +
+          "    -IDependency RootM09D23di_0001\n" +
+          "    -IService RootM09D23di_0002\n" +
           "    + T ResolveᐸTᐳ()\n" +
           "    + T ResolveᐸTᐳ(object? tag)\n" +
           "    + object GetService(Type type)\n" +
@@ -227,33 +227,33 @@ partial class ServiceProvider
           "    <<abstract>>\n" +
         "  }\n" +
         "  Service o--  \"Singleton\" Dependency : IDependency\n" +
-        "  ServiceProvider ..> Dependency : IDependency RootM09D22di_0001\n" +
-        "  ServiceProvider ..> Service : IService RootM09D22di_0002";
+        "  ServiceProvider ..> Dependency : IDependency RootM09D23di_0001\n" +
+        "  ServiceProvider ..> Service : IService RootM09D23di_0002";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>[] _bucketsM09D23di;
   
   static ServiceProvider()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<ServiceProvider, object>>(typeof(Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService), valResolverM09D23di_0001)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<ServiceProvider, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<ServiceProvider, T>
   {
-    public static global::Pure.DI.IResolver<ServiceProvider, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<ServiceProvider, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(ServiceProvider composite)
     {
@@ -266,34 +266,34 @@ partial class ServiceProvider
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<ServiceProvider, Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<ServiceProvider, Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency Resolve(ServiceProvider composition)
     {
-      return composition.RootM09D22di_0001;
+      return composition.RootM09D23di_0001;
     }
     
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency ResolveByTag(ServiceProvider composition, object tag)
     {
-      if (Equals(tag, null)) return composition.RootM09D22di_0001;
+      if (Equals(tag, null)) return composition.RootM09D23di_0001;
       throw new global::System.InvalidOperationException($"Cannot resolve composition root \"{tag}\" of type Pure.DI.UsageTests.BCL.ServiceProviderScenario.IDependency.");
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<ServiceProvider, Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<ServiceProvider, Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService Resolve(ServiceProvider composition)
     {
-      return composition.RootM09D22di_0002;
+      return composition.RootM09D23di_0002;
     }
     
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService ResolveByTag(ServiceProvider composition, object tag)
     {
-      if (Equals(tag, null)) return composition.RootM09D22di_0002;
+      if (Equals(tag, null)) return composition.RootM09D23di_0002;
       throw new global::System.InvalidOperationException($"Cannot resolve composition root \"{tag}\" of type Pure.DI.UsageTests.BCL.ServiceProviderScenario.IService.");
     }
   }
diff --git a/readme/singleton.md b/readme/singleton.md
index 38d6ae77..73e04599 100644
--- a/readme/singleton.md
+++ b/readme/singleton.md
@@ -79,20 +79,20 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.UsageTests.Lifetimes.SingletonScenario.Dependency _singletonM09D22di22;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.UsageTests.Lifetimes.SingletonScenario.Dependency _singletonM09D23di22;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di22 = parent._singletonM09D22di22;
+      _singletonM09D23di22 = parent._singletonM09D23di22;
     }
   }
   
@@ -102,18 +102,18 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di22, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di22, null))
               {
-                  _singletonM09D22di22 = new Pure.DI.UsageTests.Lifetimes.SingletonScenario.Dependency();
+                  _singletonM09D23di22 = new Pure.DI.UsageTests.Lifetimes.SingletonScenario.Dependency();
               }
           }
       }
-      Pure.DI.UsageTests.Lifetimes.SingletonScenario.Service transientM09D22di128 = new Pure.DI.UsageTests.Lifetimes.SingletonScenario.Service(_singletonM09D22di22, _singletonM09D22di22);
-      return transientM09D22di128;
+      var transientM09D23di128 = new Pure.DI.UsageTests.Lifetimes.SingletonScenario.Service(_singletonM09D23di22, _singletonM09D23di22);
+      return transientM09D23di128;
     }
   }
   #endregion
@@ -125,7 +125,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -134,7 +134,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -143,10 +143,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -162,10 +162,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -206,26 +206,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -238,7 +238,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.SingletonScenario.IService Resolve(Composition composition)
diff --git a/readme/span-and-readonlyspan.md b/readme/span-and-readonlyspan.md
index 0430c593..fce5e292 100644
--- a/readme/span-and-readonlyspan.md
+++ b/readme/span-and-readonlyspan.md
@@ -71,16 +71,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -89,17 +89,17 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.BCL.SpanScenario.Dependency transientM09D22di41 = new Pure.DI.UsageTests.BCL.SpanScenario.Dependency();
-      Pure.DI.UsageTests.BCL.SpanScenario.Dependency transientM09D22di40 = new Pure.DI.UsageTests.BCL.SpanScenario.Dependency();
-      Pure.DI.UsageTests.BCL.SpanScenario.Dependency transientM09D22di39 = new Pure.DI.UsageTests.BCL.SpanScenario.Dependency();
-      System.ReadOnlySpan<Pure.DI.UsageTests.BCL.SpanScenario.Dependency> transientM09D22di38 = stackalloc Pure.DI.UsageTests.BCL.SpanScenario.Dependency[3]
+      var transientM09D23di41 = new Pure.DI.UsageTests.BCL.SpanScenario.Dependency();
+      var transientM09D23di40 = new Pure.DI.UsageTests.BCL.SpanScenario.Dependency();
+      var transientM09D23di39 = new Pure.DI.UsageTests.BCL.SpanScenario.Dependency();
+      System.ReadOnlySpan<Pure.DI.UsageTests.BCL.SpanScenario.Dependency> transientM09D23di38 = stackalloc Pure.DI.UsageTests.BCL.SpanScenario.Dependency[3]
       {
-          transientM09D22di39,
-          transientM09D22di40,
-          transientM09D22di41
+          transientM09D23di39,
+          transientM09D23di40,
+          transientM09D23di41
       };
-      Pure.DI.UsageTests.BCL.SpanScenario.Service transientM09D22di37 = new Pure.DI.UsageTests.BCL.SpanScenario.Service(transientM09D22di38);
-      return transientM09D22di37;
+      var transientM09D23di37 = new Pure.DI.UsageTests.BCL.SpanScenario.Service(transientM09D23di38);
+      return transientM09D23di37;
     }
   }
   #endregion
@@ -111,7 +111,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -120,7 +120,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -129,10 +129,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -148,10 +148,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -191,26 +191,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.SpanScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.SpanScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.SpanScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.SpanScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -223,7 +223,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.SpanScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.SpanScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.SpanScenario.IService Resolve(Composition composition)
diff --git a/readme/tag-attribute.md b/readme/tag-attribute.md
index 016382dd..1789a8f4 100644
--- a/readme/tag-attribute.md
+++ b/readme/tag-attribute.md
@@ -89,16 +89,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -107,10 +107,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.TagAttributeScenario.XyzDependency transientM09D22di11 = new Pure.DI.UsageTests.Basics.TagAttributeScenario.XyzDependency();
-      Pure.DI.UsageTests.Basics.TagAttributeScenario.AbcDependency transientM09D22di10 = new Pure.DI.UsageTests.Basics.TagAttributeScenario.AbcDependency();
-      Pure.DI.UsageTests.Basics.TagAttributeScenario.Service transientM09D22di9 = new Pure.DI.UsageTests.Basics.TagAttributeScenario.Service(transientM09D22di10, transientM09D22di11);
-      return transientM09D22di9;
+      var transientM09D23di11 = new Pure.DI.UsageTests.Basics.TagAttributeScenario.XyzDependency();
+      var transientM09D23di10 = new Pure.DI.UsageTests.Basics.TagAttributeScenario.AbcDependency();
+      var transientM09D23di9 = new Pure.DI.UsageTests.Basics.TagAttributeScenario.Service(transientM09D23di10, transientM09D23di11);
+      return transientM09D23di9;
     }
   }
   #endregion
@@ -122,7 +122,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -131,7 +131,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -140,10 +140,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -159,10 +159,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -207,26 +207,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.TagAttributeScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.TagAttributeScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.TagAttributeScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.TagAttributeScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -239,7 +239,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.TagAttributeScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.TagAttributeScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.TagAttributeScenario.IService Resolve(Composition composition)
diff --git a/readme/tags.md b/readme/tags.md
index e08f1f12..c2fd1589 100644
--- a/readme/tags.md
+++ b/readme/tags.md
@@ -105,20 +105,20 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
-  private Pure.DI.UsageTests.Basics.TagsScenario.XyzDependency _singletonM09D22di23;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
+  private Pure.DI.UsageTests.Basics.TagsScenario.XyzDependency _singletonM09D23di23;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
-    lock (parent._disposableSingletonsM09D22di)
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
+    lock (parent._disposableSingletonsM09D23di)
     {
-      _singletonM09D22di23 = parent._singletonM09D22di23;
+      _singletonM09D23di23 = parent._singletonM09D23di23;
     }
   }
   
@@ -128,17 +128,17 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
               {
-                  _singletonM09D22di23 = new Pure.DI.UsageTests.Basics.TagsScenario.XyzDependency();
+                  _singletonM09D23di23 = new Pure.DI.UsageTests.Basics.TagsScenario.XyzDependency();
               }
           }
       }
-      return _singletonM09D22di23;
+      return _singletonM09D23di23;
     }
   }
   
@@ -147,20 +147,20 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Basics.TagsScenario.AbcDependency transientM09D22di103 = new Pure.DI.UsageTests.Basics.TagsScenario.AbcDependency();
-      if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+      var transientM09D23di103 = new Pure.DI.UsageTests.Basics.TagsScenario.AbcDependency();
+      if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
       {
-          lock (_disposableSingletonsM09D22di)
+          lock (_disposableSingletonsM09D23di)
           {
-              if (global::System.Object.ReferenceEquals(_singletonM09D22di23, null))
+              if (global::System.Object.ReferenceEquals(_singletonM09D23di23, null))
               {
-                  _singletonM09D22di23 = new Pure.DI.UsageTests.Basics.TagsScenario.XyzDependency();
+                  _singletonM09D23di23 = new Pure.DI.UsageTests.Basics.TagsScenario.XyzDependency();
               }
           }
       }
-      Pure.DI.UsageTests.Basics.TagsScenario.AbcDependency transientM09D22di102 = new Pure.DI.UsageTests.Basics.TagsScenario.AbcDependency();
-      Pure.DI.UsageTests.Basics.TagsScenario.Service transientM09D22di101 = new Pure.DI.UsageTests.Basics.TagsScenario.Service(transientM09D22di102, _singletonM09D22di23, transientM09D22di103);
-      return transientM09D22di101;
+      var transientM09D23di102 = new Pure.DI.UsageTests.Basics.TagsScenario.AbcDependency();
+      var transientM09D23di101 = new Pure.DI.UsageTests.Basics.TagsScenario.Service(transientM09D23di102, _singletonM09D23di23, transientM09D23di103);
+      return transientM09D23di101;
     }
   }
   #endregion
@@ -172,7 +172,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -181,7 +181,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -190,10 +190,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -209,10 +209,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 4));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -261,29 +261,29 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.TagsScenario.IDependency>.Value = valResolverM09D22di_0000;
-    var valResolverM09D22di_0001 = new ResolverM09D22di_0001();
-    ResolverM09D22di<Pure.DI.UsageTests.Basics.TagsScenario.IService>.Value = valResolverM09D22di_0001;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.TagsScenario.IDependency>.Value = valResolverM09D23di_0000;
+    var valResolverM09D23di_0001 = new ResolverM09D23di_0001();
+    ResolverM09D23di<Pure.DI.UsageTests.Basics.TagsScenario.IService>.Value = valResolverM09D23di_0001;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       4,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[2]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.TagsScenario.IDependency), valResolverM09D22di_0000)
-        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.TagsScenario.IService), valResolverM09D22di_0001)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.TagsScenario.IDependency), valResolverM09D23di_0000)
+        ,new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Basics.TagsScenario.IService), valResolverM09D23di_0001)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -296,7 +296,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.TagsScenario.IDependency>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.TagsScenario.IDependency>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.TagsScenario.IDependency Resolve(Composition composition)
@@ -312,7 +312,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.TagsScenario.IService>
+  private sealed class ResolverM09D23di_0001: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Basics.TagsScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Basics.TagsScenario.IService Resolve(Composition composition)
diff --git a/readme/threadsafe-hint.md b/readme/threadsafe-hint.md
index 6a1c9179..80072888 100644
--- a/readme/threadsafe-hint.md
+++ b/readme/threadsafe-hint.md
@@ -66,16 +66,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -84,9 +84,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.Dependency transientM09D22di115 = new Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.Dependency();
-      Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.Service transientM09D22di114 = new Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.Service(transientM09D22di115);
-      return transientM09D22di114;
+      var transientM09D23di115 = new Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.Dependency();
+      var transientM09D23di114 = new Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.Service(transientM09D23di115);
+      return transientM09D23di114;
     }
   }
   #endregion
@@ -98,7 +98,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -107,7 +107,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -116,10 +116,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -135,10 +135,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -178,26 +178,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -210,7 +210,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Hints.ThreadSafeHintScenario.IService Resolve(Composition composition)
diff --git a/readme/tostring-hint.md b/readme/tostring-hint.md
index a0f2db21..16564d34 100644
--- a/readme/tostring-hint.md
+++ b/readme/tostring-hint.md
@@ -64,16 +64,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -82,9 +82,9 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Hints.ToStringHintScenario.Dependency transientM09D22di117 = new Pure.DI.UsageTests.Hints.ToStringHintScenario.Dependency();
-      Pure.DI.UsageTests.Hints.ToStringHintScenario.Service transientM09D22di116 = new Pure.DI.UsageTests.Hints.ToStringHintScenario.Service(transientM09D22di117);
-      return transientM09D22di116;
+      var transientM09D23di117 = new Pure.DI.UsageTests.Hints.ToStringHintScenario.Dependency();
+      var transientM09D23di116 = new Pure.DI.UsageTests.Hints.ToStringHintScenario.Service(transientM09D23di117);
+      return transientM09D23di116;
     }
   }
   #endregion
@@ -96,7 +96,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -105,7 +105,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -114,10 +114,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -133,10 +133,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -176,26 +176,26 @@ partial class Composition
         "  Composition ..> Service : IService MyService";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Hints.ToStringHintScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Hints.ToStringHintScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.ToStringHintScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Hints.ToStringHintScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -208,7 +208,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.ToStringHintScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Hints.ToStringHintScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Hints.ToStringHintScenario.IService Resolve(Composition composition)
diff --git a/readme/transient.md b/readme/transient.md
index 26bab0eb..08281098 100644
--- a/readme/transient.md
+++ b/readme/transient.md
@@ -81,16 +81,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -99,10 +99,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Lifetimes.TransientScenario.Dependency transientM09D22di131 = new Pure.DI.UsageTests.Lifetimes.TransientScenario.Dependency();
-      Pure.DI.UsageTests.Lifetimes.TransientScenario.Dependency transientM09D22di130 = new Pure.DI.UsageTests.Lifetimes.TransientScenario.Dependency();
-      Pure.DI.UsageTests.Lifetimes.TransientScenario.Service transientM09D22di129 = new Pure.DI.UsageTests.Lifetimes.TransientScenario.Service(transientM09D22di130, transientM09D22di131);
-      return transientM09D22di129;
+      var transientM09D23di131 = new Pure.DI.UsageTests.Lifetimes.TransientScenario.Dependency();
+      var transientM09D23di130 = new Pure.DI.UsageTests.Lifetimes.TransientScenario.Dependency();
+      var transientM09D23di129 = new Pure.DI.UsageTests.Lifetimes.TransientScenario.Service(transientM09D23di130, transientM09D23di131);
+      return transientM09D23di129;
     }
   }
   #endregion
@@ -114,7 +114,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -123,7 +123,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -132,10 +132,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -151,10 +151,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -195,26 +195,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Lifetimes.TransientScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Lifetimes.TransientScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.TransientScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Lifetimes.TransientScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -227,7 +227,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.TransientScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Lifetimes.TransientScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Lifetimes.TransientScenario.IService Resolve(Composition composition)
diff --git a/readme/tuple.md b/readme/tuple.md
index 5709709a..4ade19ec 100644
--- a/readme/tuple.md
+++ b/readme/tuple.md
@@ -77,16 +77,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -95,11 +95,11 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.BCL.TupleScenario.Dependency transientM09D22di45 = new Pure.DI.UsageTests.BCL.TupleScenario.Dependency();
-      Pure.DI.UsageTests.BCL.TupleScenario.Point transientM09D22di44 = new Point(7, 9);
-      (Pure.DI.UsageTests.BCL.TupleScenario.Point Point, Pure.DI.UsageTests.BCL.TupleScenario.IDependency Dependency) transientM09D22di43 = (transientM09D22di44, transientM09D22di45);
-      Pure.DI.UsageTests.BCL.TupleScenario.Service transientM09D22di42 = new Pure.DI.UsageTests.BCL.TupleScenario.Service(transientM09D22di43);
-      return transientM09D22di42;
+      var transientM09D23di45 = new Pure.DI.UsageTests.BCL.TupleScenario.Dependency();
+      var transientM09D23di44 = new Point(7, 9);
+      var transientM09D23di43 = (transientM09D23di44, transientM09D23di45);
+      var transientM09D23di42 = new Pure.DI.UsageTests.BCL.TupleScenario.Service(transientM09D23di43);
+      return transientM09D23di42;
     }
   }
   #endregion
@@ -111,7 +111,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -120,7 +120,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -129,10 +129,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -148,10 +148,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -197,26 +197,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.BCL.TupleScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.BCL.TupleScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.TupleScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.BCL.TupleScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -229,7 +229,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.TupleScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.BCL.TupleScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.BCL.TupleScenario.IService Resolve(Composition composition)
diff --git a/readme/type-attribute.md b/readme/type-attribute.md
index 8eabe614..b8594a9b 100644
--- a/readme/type-attribute.md
+++ b/readme/type-attribute.md
@@ -80,16 +80,16 @@ classDiagram
 ```c#
 partial class Composition
 {
-  private readonly System.IDisposable[] _disposableSingletonsM09D22di;
+  private readonly System.IDisposable[] _disposableSingletonsM09D23di;
   
   public Composition()
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   internal Composition(Composition parent)
   {
-    _disposableSingletonsM09D22di = new System.IDisposable[0];
+    _disposableSingletonsM09D23di = new System.IDisposable[0];
   }
   
   #region Composition Roots
@@ -98,10 +98,10 @@ partial class Composition
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     get
     {
-      Pure.DI.UsageTests.Attributes.TypeAttributeScenario.XyzDependency transientM09D22di14 = new Pure.DI.UsageTests.Attributes.TypeAttributeScenario.XyzDependency();
-      Pure.DI.UsageTests.Attributes.TypeAttributeScenario.AbcDependency transientM09D22di13 = new Pure.DI.UsageTests.Attributes.TypeAttributeScenario.AbcDependency();
-      Pure.DI.UsageTests.Attributes.TypeAttributeScenario.Service transientM09D22di12 = new Pure.DI.UsageTests.Attributes.TypeAttributeScenario.Service(transientM09D22di13, transientM09D22di14);
-      return transientM09D22di12;
+      var transientM09D23di14 = new Pure.DI.UsageTests.Attributes.TypeAttributeScenario.XyzDependency();
+      var transientM09D23di13 = new Pure.DI.UsageTests.Attributes.TypeAttributeScenario.AbcDependency();
+      var transientM09D23di12 = new Pure.DI.UsageTests.Attributes.TypeAttributeScenario.Service(transientM09D23di13, transientM09D23di14);
+      return transientM09D23di12;
     }
   }
   #endregion
@@ -113,7 +113,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>()
   {
-    return ResolverM09D22di<T>.Value.Resolve(this);
+    return ResolverM09D23di<T>.Value.Resolve(this);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -122,7 +122,7 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public T Resolve<T>(object? tag)
   {
-    return ResolverM09D22di<T>.Value.ResolveByTag(this, tag);
+    return ResolverM09D23di<T>.Value.ResolveByTag(this, tag);
   }
   
   #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP || NET40_OR_GREATER
@@ -131,10 +131,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.Resolve(this);
@@ -150,10 +150,10 @@ partial class Composition
   [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
   public object Resolve(global::System.Type type, object? tag)
   {
-    var index = (int)(_bucketSizeM09D22di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
-    var finish = index + _bucketSizeM09D22di;
+    var index = (int)(_bucketSizeM09D23di * ((uint)global::System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(type) % 1));
+    var finish = index + _bucketSizeM09D23di;
     do {
-      ref var pair = ref _bucketsM09D22di[index];
+      ref var pair = ref _bucketsM09D23di[index];
       if (ReferenceEquals(pair.Key, type))
       {
         return pair.Value.ResolveByTag(this, tag);
@@ -193,26 +193,26 @@ partial class Composition
         "  Composition ..> Service : IService Root";
   }
   
-  private readonly static int _bucketSizeM09D22di;
-  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D22di;
+  private readonly static int _bucketSizeM09D23di;
+  private readonly static global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[] _bucketsM09D23di;
   
   static Composition()
   {
-    var valResolverM09D22di_0000 = new ResolverM09D22di_0000();
-    ResolverM09D22di<Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService>.Value = valResolverM09D22di_0000;
-    _bucketsM09D22di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
+    var valResolverM09D23di_0000 = new ResolverM09D23di_0000();
+    ResolverM09D23di<Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService>.Value = valResolverM09D23di_0000;
+    _bucketsM09D23di = global::Pure.DI.Buckets<global::System.Type, global::Pure.DI.IResolver<Composition, object>>.Create(
       1,
-      out _bucketSizeM09D22di,
+      out _bucketSizeM09D23di,
       new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>[1]
       {
-         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService), valResolverM09D22di_0000)
+         new global::Pure.DI.Pair<global::System.Type, global::Pure.DI.IResolver<Composition, object>>(typeof(Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService), valResolverM09D23di_0000)
       });
   }
   
   #region Resolvers
-  private sealed class ResolverM09D22di<T>: global::Pure.DI.IResolver<Composition, T>
+  private sealed class ResolverM09D23di<T>: global::Pure.DI.IResolver<Composition, T>
   {
-    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D22di<T>();
+    public static global::Pure.DI.IResolver<Composition, T> Value = new ResolverM09D23di<T>();
     
     public T Resolve(Composition composite)
     {
@@ -225,7 +225,7 @@ partial class Composition
     }
   }
   
-  private sealed class ResolverM09D22di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService>
+  private sealed class ResolverM09D23di_0000: global::Pure.DI.IResolver<Composition, Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService>
   {
     [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)0x300)]
     public Pure.DI.UsageTests.Attributes.TypeAttributeScenario.IService Resolve(Composition composition)
diff --git a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
index 9f862204..92da1691 100644
--- a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
@@ -6,22 +6,26 @@ internal class BlockCodeBuilder: ICodeBuilder<Block>
     public void Build(BuildContext ctx, in Block block)
     {
         var variable = ctx.Variable;
-        if (!TryCreate(ctx, variable))
+        if (!IsNewInstanceRequired(ctx, variable))
         {
             return;
         }
 
-        var toCheckExistence = variable.Node.Lifetime != Lifetime.Transient;
         var level = ctx.Level;
+        var lockIsRequired = ctx.LockIsRequired ?? ctx.DependencyGraph.Source.Hints.GetHint(Hint.ThreadSafe, SettingState.On) == SettingState.On;
+        var toCheckExistence =
+            // The "singleton" instance must be created with a check each time
+            variable.Node.Lifetime == Lifetime.Singleton
+            // The "per resolve" instance should be created without checks if it is the only one in the composition
+            || (variable.Node.Lifetime == Lifetime.PerResolve && variable.Info.RefCount > 1);
+        
         if (toCheckExistence)
         {
-            var checkExpression = variable.InstanceType.IsValueType switch
-            {
-                true => $"!{variable.VarName}Created",
-                false => $"{Names.SystemNamespace}Object.ReferenceEquals({variable.VarName}, null)"
-            };
-            
-            if (ctx.IsThreadSafe)
+            var checkExpression = variable.InstanceType.IsValueType
+                ? $"!{variable.VarName}Created"
+                : $"{Names.SystemNamespace}Object.ReferenceEquals({variable.VarName}, null)";
+
+            if (lockIsRequired)
             {
                 ctx.Code.AppendLine($"if ({checkExpression})");
                 ctx.Code.AppendLine("{");
@@ -29,17 +33,18 @@ public void Build(BuildContext ctx, in Block block)
                 ctx.Code.AppendLine($"lock ({Names.DisposablesFieldName})");
                 ctx.Code.AppendLine("{");
                 ctx.Code.IncIndent();
+                ctx = ctx with { LockIsRequired = false };
             }
             
             ctx.Code.AppendLine($"if ({checkExpression})");
             ctx.Code.AppendLine("{");
             ctx.Code.IncIndent();
-            level++;
+            ctx = ctx with { Level = level + 1 };
         }
-        
+
         foreach (var statement in block.Statements)
         {
-            ctx.StatementBuilder.Build(ctx with { Level = level, Variable = statement.Current }, statement);
+            ctx.StatementBuilder.Build(ctx with { Variable = statement.Current }, statement);
         }
 
         if (!toCheckExistence)
@@ -55,12 +60,11 @@ public void Build(BuildContext ctx, in Block block)
         if (variable.InstanceType.IsValueType)
         {
             ctx.Code.AppendLine($"{variable.VarName}Created = true;");
-            ctx.Code.AppendLine($"{Names.SystemNamespace}Threading.Thread.MemoryBarrier();");
         }
             
         ctx.Code.DecIndent();
         ctx.Code.AppendLine("}");
-        if (!ctx.IsThreadSafe)
+        if (!lockIsRequired)
         {
             return;
         }
@@ -72,14 +76,15 @@ public void Build(BuildContext ctx, in Block block)
         ctx.Code.AppendLine();
     }
     
-    private static bool TryCreate(BuildContext ctx, Variable variable)
+    private static bool IsNewInstanceRequired(BuildContext ctx, Variable variable)
     {
         // A transient instance must be created each time
         if (variable.Node.Lifetime == Lifetime.Transient)
         {
             return true;
         }
-
+        
+        // Do not create an instance if it has already been created at this level or a level below it
         if (ctx.Level >= variable.Info.Level)
         {
             return false;
diff --git a/src/Pure.DI.Core/Core/Code/BuildContext.cs b/src/Pure.DI.Core/Core/Code/BuildContext.cs
index 4f6ae9a9..5a1bbc70 100644
--- a/src/Pure.DI.Core/Core/Code/BuildContext.cs
+++ b/src/Pure.DI.Core/Core/Code/BuildContext.cs
@@ -8,4 +8,4 @@ internal record BuildContext(
     Variable Variable,
     LinesBuilder Code,
     object? ContextTag,
-    bool IsThreadSafe);
\ No newline at end of file
+    bool? LockIsRequired);
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/BuildTools.cs b/src/Pure.DI.Core/Core/Code/BuildTools.cs
index 6f45f3a7..66a4f7b4 100644
--- a/src/Pure.DI.Core/Core/Code/BuildTools.cs
+++ b/src/Pure.DI.Core/Core/Code/BuildTools.cs
@@ -9,7 +9,7 @@ internal class BuildTools : IBuildTools
 
     public BuildTools(IFilter filter) => _filter = filter;
 
-    public string GetDeclaration(Variable variable) => variable.IsDeclared ? "" : $"{variable.InstanceType} ";
+    public string GetDeclaration(Variable variable, bool typeIsRequired = false) => variable.IsDeclared ? "" : typeIsRequired ? $"{variable.InstanceType} " : "var ";
     
     public string OnInjected(BuildContext ctx, Variable variable)
     {
diff --git a/src/Pure.DI.Core/Core/Code/CompositionBuilder.cs b/src/Pure.DI.Core/Core/Code/CompositionBuilder.cs
index 83ce7226..67c7adcf 100644
--- a/src/Pure.DI.Core/Core/Code/CompositionBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/CompositionBuilder.cs
@@ -26,7 +26,6 @@ public CompositionBuilder(
 
     public CompositionCode Build(DependencyGraph graph)
     {
-        var isThreadSafe = graph.Source.Hints.GetHint(Hint.ThreadSafe, SettingState.On) == SettingState.On;
         var roots = new List<Root>();
         var map = new VariablesMap();
         var allArgs = new HashSet<Variable>();
@@ -34,11 +33,20 @@ public CompositionCode Build(DependencyGraph graph)
         {
             _cancellationToken.ThrowIfCancellationRequested();
             var rootBlock = _variablesBuilder.Build(graph.Graph, map, root.Node, root.Injection);
-            var ctx = new BuildContext(0, _buildTools, _statementBuilder, graph, rootBlock.Current, new LinesBuilder(), default, isThreadSafe);
+            var ctx = new BuildContext(
+                0,
+                _buildTools,
+                _statementBuilder,
+                graph,
+                rootBlock.Current,
+                new LinesBuilder(),
+                default,
+                default);
+
             foreach (var perResolveVar in map.GetPerResolves())
             {
-                ctx.Code.AppendLine($"{perResolveVar.InstanceType} {perResolveVar.VarName} = default({perResolveVar.InstanceType});");
-                if (perResolveVar.InstanceType.IsValueType)
+                ctx.Code.AppendLine($"var {perResolveVar.VarName} = default({perResolveVar.InstanceType});");
+                if (perResolveVar.Info.RefCount > 1 && perResolveVar.InstanceType.IsValueType)
                 {
                     ctx.Code.AppendLine($"var {perResolveVar.VarName}Created = false;");
                 }
diff --git a/src/Pure.DI.Core/Core/Code/ConstructCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/ConstructCodeBuilder.cs
index 950bef18..d5753bae 100644
--- a/src/Pure.DI.Core/Core/Code/ConstructCodeBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/ConstructCodeBuilder.cs
@@ -45,7 +45,7 @@ private static void BuildEnumerable(BuildContext ctx)
             var hasYieldReturn = false;
             foreach (var statement in variable.Args)
             {
-                ctx.StatementBuilder.Build(ctx with { Level = level, Variable = statement.Current }, statement);
+                ctx.StatementBuilder.Build(ctx with { Level = level, Variable = statement.Current, LockIsRequired = default }, statement);
                 code.AppendLine($"yield return {ctx.BuildTools.OnInjected(ctx, statement.Current)};");
                 hasYieldReturn = true;
             }
@@ -79,7 +79,7 @@ private static void BuildSpan(BuildContext ctx, DpConstruct span)
             && span.Binding.SemanticModel.Compilation.GetLanguageVersion() >= LanguageVersion.CSharp7_3;
         
         var createInstance = isStackalloc ? $"stackalloc {createArray}" : $"new {Names.SystemNamespace}Span<{span.Source.ElementType}>(new {createArray})";
-        ctx.Code.AppendLine($"{ctx.BuildTools.GetDeclaration(variable)}{variable.VarName} = {createInstance};");
+        ctx.Code.AppendLine($"{ctx.BuildTools.GetDeclaration(variable, isStackalloc)}{variable.VarName} = {createInstance};");
         ctx.Code.AppendLines(ctx.BuildTools.OnCreated(ctx, variable));
     }
 
diff --git a/src/Pure.DI.Core/Core/Code/FactoryCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/FactoryCodeBuilder.cs
index 06b36126..d8fd2dc8 100644
--- a/src/Pure.DI.Core/Core/Code/FactoryCodeBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/FactoryCodeBuilder.cs
@@ -10,9 +10,11 @@ public void Build(BuildContext ctx, in DpFactory factory)
         var variable = ctx.Variable;
         var code = ctx.Code;
         var level = ctx.Level;
+        var lockIsRequired = ctx.LockIsRequired;
         if (variable.Node.IsLazy())
         {
             level++;
+            lockIsRequired = default;
         }
         
         // Rewrites syntax tree
@@ -33,7 +35,7 @@ public void Build(BuildContext ctx, in DpFactory factory)
         {
             if (!variable.IsDeclared)
             {
-                code.AppendLine($"{ctx.BuildTools.GetDeclaration(variable)}{variable.VarName};");
+                code.AppendLine($"{ctx.BuildTools.GetDeclaration(variable, true)}{variable.VarName};");
             }
         }
 
@@ -50,7 +52,7 @@ public void Build(BuildContext ctx, in DpFactory factory)
                 var (injection, argument) = resolvers.Current;
                 using (code.Indent(indent.Value))
                 {
-                    ctx.StatementBuilder.Build(ctx with { Level = level, Variable = argument.Current }, argument);
+                    ctx.StatementBuilder.Build(ctx with { Level = level, Variable = argument.Current, LockIsRequired = lockIsRequired }, argument);
                     code.AppendLine($"{(injection.DeclarationRequired ? "var " : "")}{injection.VariableName} = {ctx.BuildTools.OnInjected(ctx, argument.Current)};");
                 }
             }
diff --git a/src/Pure.DI.Core/Core/Code/IBuildTools.cs b/src/Pure.DI.Core/Core/Code/IBuildTools.cs
index d23cb25d..eded8add 100644
--- a/src/Pure.DI.Core/Core/Code/IBuildTools.cs
+++ b/src/Pure.DI.Core/Core/Code/IBuildTools.cs
@@ -2,7 +2,7 @@ namespace Pure.DI.Core.Code;
 
 internal interface IBuildTools
 {
-    string GetDeclaration(Variable variable);
+    string GetDeclaration(Variable variable, bool typeIsRequired = false);
 
     string OnInjected(BuildContext ctx, Variable variable);
     
diff --git a/src/Pure.DI.Core/Core/Code/StatementCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/StatementCodeBuilder.cs
index 2dc8fb23..692844f8 100644
--- a/src/Pure.DI.Core/Core/Code/StatementCodeBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/StatementCodeBuilder.cs
@@ -21,7 +21,7 @@ public void Build(BuildContext ctx, in IStatement statement)
         switch (statement)
         {
             case Variable variable:
-                if (!variable.IsCreated)
+                if (!variable.Info.IsAlreadyCreated)
                 {
                     _variableBuilder.Build(ctx, variable);
                 }
diff --git a/src/Pure.DI.Core/Core/Code/Variable.cs b/src/Pure.DI.Core/Core/Code/Variable.cs
index c1febf55..64e4efbe 100644
--- a/src/Pure.DI.Core/Core/Code/Variable.cs
+++ b/src/Pure.DI.Core/Core/Code/Variable.cs
@@ -13,8 +13,6 @@ internal record Variable(
     
     public bool IsDeclared { get; } = Node.Lifetime != Lifetime.Transient || Node.IsArg();
     
-    public bool IsCreated { get; set; }
-    
     public string VarName
     {
         get
@@ -47,10 +45,4 @@ public string VarName
     public ITypeSymbol ContractType => Injection.Type;
 
     public override string ToString() => $"{InstanceType} {VarName}";
-
-    public void Reset()
-    {
-        IsCreated = false;
-        Info.Level = int.MaxValue;
-    }
 }
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/VariableInfo.cs b/src/Pure.DI.Core/Core/Code/VariableInfo.cs
index 572cd939..2c778555 100644
--- a/src/Pure.DI.Core/Core/Code/VariableInfo.cs
+++ b/src/Pure.DI.Core/Core/Code/VariableInfo.cs
@@ -2,5 +2,14 @@
 
 internal class VariableInfo
 {
-    public int Level = int.MaxValue; 
+    public int Level = int.MaxValue;
+    public int RefCount;
+    public bool IsAlreadyCreated;
+    
+    public void Reset()
+    {
+        Level = int.MaxValue;
+        RefCount = 0;
+        IsAlreadyCreated = false;
+    }
 }
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs b/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
index ab9fde25..1bce7174 100644
--- a/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
@@ -61,7 +61,12 @@ public Block Build(
                             }
 
                             var depVariable = CreateVariable(currentStatement, map, depNode, depInjection);
-                            depVariable.IsCreated = isAlreadyCreated;
+                            if (isAlreadyCreated)
+                            {
+                                depVariable.Info.IsAlreadyCreated = true;
+                                depVariable.Info.RefCount--;
+                            }
+                            
                             var isBlockStatement = !variable.Node.IsEnumerable() && !variable.Node.IsFactory();
                             var isBlock = depNode.Lifetime != Lifetime.Transient || variable.Node.IsLazy();
                             if (isBlock)
@@ -116,6 +121,7 @@ private Variable CreateVariable(
         {
             if (map.TryGetValue(node.Binding, out var currentVar))
             {
+                currentVar.Info.RefCount++;
                 return currentVar with
                 {
                     Parent = parent,
@@ -127,6 +133,7 @@ private Variable CreateVariable(
 
         var id = GetId(node);
         var var = new Variable(parent, id, node, injection, new List<IStatement>(), new VariableInfo());
+        var.Info.RefCount++;
         if (isSharedVar)
         {
             map.Add(node.Binding, var);
diff --git a/src/Pure.DI.Core/Core/Code/VariablesMap.cs b/src/Pure.DI.Core/Core/Code/VariablesMap.cs
index 7bc6ba77..a51bbeaa 100644
--- a/src/Pure.DI.Core/Core/Code/VariablesMap.cs
+++ b/src/Pure.DI.Core/Core/Code/VariablesMap.cs
@@ -4,6 +4,11 @@ internal class VariablesMap: Dictionary<MdBinding, Variable>
 {
     public void Reset()
     {
+        foreach (var variable in Values)
+        {
+            variable.Info.Reset();
+        }
+
         var classBindings = this
             .Where(i => i.Value.Node.Arg is not null || i.Value.Node.Lifetime != Lifetime.Singleton)
             .Select(i => i.Key)
@@ -13,11 +18,6 @@ public void Reset()
         {
             Remove(singletonBinding);
         }
-
-        foreach (var variable in Values)
-        {
-            variable.Reset();
-        }
     }
 
     public IEnumerable<Variable> GetSingletons() => this
diff --git a/tests/Pure.DI.IntegrationTests/LifetimesTests.cs b/tests/Pure.DI.IntegrationTests/LifetimesTests.cs
index 26d73e30..683d6b59 100644
--- a/tests/Pure.DI.IntegrationTests/LifetimesTests.cs
+++ b/tests/Pure.DI.IntegrationTests/LifetimesTests.cs
@@ -634,6 +634,7 @@ public static void Main()
             var service = composition.Service;
             var service2 = composition.Service;
             Console.WriteLine(service.Dep == service.Sin.Dep);        
+            Console.WriteLine(service.Dep != service2.Dep);
             Console.WriteLine(service.Sin == service2.Sin);
         }
     }                
@@ -642,7 +643,7 @@ public static void Main()
 
         // Then
         result.Success.ShouldBeTrue(result);
-        result.StdOut.ShouldBe(ImmutableArray.Create("True", "True"), result);
+        result.StdOut.ShouldBe(ImmutableArray.Create("True", "True", "True"), result);
     }
     
     [Fact]