From 96761f9a4a23bdf782cfef20c512a81842c50eb5 Mon Sep 17 00:00:00 2001
From: Nikolay Pianikov <nikolayp@mail.ru>
Date: Thu, 21 Nov 2024 10:11:47 +0300
Subject: [PATCH] Supporting of System.Threading.Lock type

---
 .github/workflows/main.yml                    |   2 +-
 Directory.Build.props                         |   2 +-
 README.md                                     | 124 +++++++++---------
 .../Pure.DI.Benchmarks.csproj                 |   4 +-
 ...DI.Benchmarks.Benchmarks.Array-report.html |  38 +++---
 ....DI.Benchmarks.Benchmarks.Enum-report.html |  38 +++---
 ....DI.Benchmarks.Benchmarks.Func-report.html |  38 +++---
 ...enchmarks.Benchmarks.Singleton-report.html |  38 +++---
 ...enchmarks.Benchmarks.Transient-report.html |  36 ++---
 build/CompatibilityCheckTarget.cs             |   1 +
 build/ReadmeTarget.cs                         |   2 +-
 readme/Avalonia.md                            |   2 +-
 readme/BlazorServerApp.md                     |   2 +-
 readme/BlazorWebAssemblyApp.md                |   2 +-
 readme/Console.md                             |   2 +-
 readme/ConsoleTopLevelStatements.md           |   2 +-
 readme/GrpcService.md                         |   2 +-
 readme/ReadmeTemplate.md                      |   8 +-
 readme/WebAPI.md                              |   2 +-
 readme/WebApp.md                              |   2 +-
 readme/WinFormsAppNetCore.md                  |   2 +-
 readme/Wpf.md                                 |   2 +-
 readme/accumulators.md                        |  10 +-
 readme/async-disposable-scope.md              |  15 ++-
 readme/async-disposable-singleton.md          |  15 ++-
 readme/auto-scoped.md                         |   6 +-
 readme/bind-attribute-for-a-generic-type.md   |   6 +-
 .../bind-attribute-with-lifetime-and-tag.md   |   6 +-
 readme/bind-attribute.md                      |   6 +-
 readme/custom-attributes.md                   |   8 +-
 readme/custom-universal-attribute.md          |   8 +-
 .../default-lifetime-for-a-type-and-a-tag.md  |   8 +-
 readme/default-lifetime-for-a-type.md         |   6 +-
 readme/default-lifetime.md                    |   6 +-
 readme/disposable-singleton.md                |   8 +-
 readme/exposed-generic-roots-with-args.md     |   6 +-
 readme/exposed-generic-roots.md               |   6 +-
 readme/exposed-roots-with-tags.md             |   6 +-
 readme/exposed-roots.md                       |   6 +-
 readme/func-with-arguments.md                 |   6 +-
 readme/keyed-service-provider.md              |   8 +-
 readme/onnewinstance-hint.md                  |   6 +-
 readme/perblock.md                            |   6 +-
 readme/perresolve.md                          |   8 +-
 readme/root-binding.md                        |   6 +-
 readme/scope.md                               |   8 +-
 readme/service-collection.md                  |   8 +-
 readme/service-provider-with-scope.md         |  10 +-
 readme/service-provider.md                    |   8 +-
 readme/singleton.md                           |   6 +-
 readme/tag-type.md                            |   8 +-
 readme/tags.md                                |   8 +-
 ...async-disposable-instances-in-delegates.md |  10 +-
 ...osable-instances-per-a-composition-root.md |   8 +-
 ...cking-disposable-instances-in-delegates.md |  10 +-
 ...osable-instances-per-a-composition-root.md |   8 +-
 ...able-instances-with-different-lifetimes.md |  16 +--
 .../BlazorWebAssemblyApp.csproj               |   2 +-
 samples/Clock.Tests/Clock.Tests.csproj        |   2 +-
 samples/GrpcService/GrpcService.csproj        |   2 +-
 samples/MinimalWebAPI/MinimalWebAPI.csproj    |   2 +-
 .../WeatherForecast/WeatherForecast.csproj    |   2 +-
 samples/WebAPI/WebAPI.csproj                  |   2 +-
 .../Core/AsyncDisposableSettings.cs           |  12 --
 src/Pure.DI.Core/Core/BindingBuilder.cs       |   4 +-
 .../Core/Code/ApiMembersBuilder.cs            |   2 +-
 .../Core/Code/BlockCodeBuilder.cs             |  11 +-
 src/Pure.DI.Core/Core/Code/BuildTools.cs      |   7 +-
 src/Pure.DI.Core/Core/Code/ClassBuilder.cs    |   2 +-
 .../Core/Code/ClassDiagramBuilder.cs          |   2 +-
 .../Core/Code/DefaultConstructorBuilder.cs    |   6 +-
 .../Core/Code/DisposeMethodBuilder.cs         |  14 +-
 src/Pure.DI.Core/Core/Code/FieldsBuilder.cs   |   9 +-
 src/Pure.DI.Core/Core/Code/ILocks.cs          |  10 ++
 src/Pure.DI.Core/Core/Code/Locks.cs           |  42 ++++++
 src/Pure.DI.Core/Core/Code/NodeInfo.cs        |   6 +-
 .../Code/ParameterizedConstructorBuilder.cs   |   5 +-
 .../Core/DependencyGraphBuilder.cs            |   2 +-
 .../Core/IAsyncDisposableSettings.cs          |   6 -
 src/Pure.DI.Core/Core/ITypes.cs               |   6 +
 .../Core/Models/CompositionCode.cs            |   7 +-
 src/Pure.DI.Core/Core/Names.cs                |   7 +-
 src/Pure.DI.Core/Core/SpecialType.cs          |   8 ++
 src/Pure.DI.Core/Core/SpecialTypeKey.cs       |   3 +
 src/Pure.DI.Core/Core/Types.cs                |  19 +++
 src/Pure.DI.Core/Generator.cs                 |   5 +-
 src/Pure.DI.MS/Pure.DI.MS.csproj              |   2 +-
 .../.template.config/template.json            |   4 +-
 .../.template.config/template.json            |   4 +-
 .../Pure.DI.IntegrationTests.csproj           |   2 +-
 tests/Pure.DI.Tests/Pure.DI.Tests.csproj      |   2 +-
 .../Pure.DI.UsageTests.csproj                 |   4 +-
 92 files changed, 484 insertions(+), 372 deletions(-)
 delete mode 100644 src/Pure.DI.Core/Core/AsyncDisposableSettings.cs
 create mode 100644 src/Pure.DI.Core/Core/Code/ILocks.cs
 create mode 100644 src/Pure.DI.Core/Core/Code/Locks.cs
 delete mode 100644 src/Pure.DI.Core/Core/IAsyncDisposableSettings.cs
 create mode 100644 src/Pure.DI.Core/Core/ITypes.cs
 create mode 100644 src/Pure.DI.Core/Core/SpecialType.cs
 create mode 100644 src/Pure.DI.Core/Core/SpecialTypeKey.cs
 create mode 100644 src/Pure.DI.Core/Core/Types.cs

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 384eef5e..9f89f533 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Build and check
         run: dotnet run --project ./build -- check      
diff --git a/Directory.Build.props b/Directory.Build.props
index 50285773..bbbf9cc4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
         <InternalVersion>2.1.39</InternalVersion>
         <BasePackageId>Pure.DI</BasePackageId>
         <LangVersion>latest</LangVersion>
-        <BaseTargetFramework>net8.0</BaseTargetFramework>
+        <BaseTargetFramework>net9.0</BaseTargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/README.md b/README.md
index a91a88cc..3dd722cd 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ The above code specifies the generation of a partial class named *__Composition_
 ```c#
 partial class Composition
 {
-    private object _lock = new object();
+    private Lock _lock = new Lock()();
     private Random? _random;
     
     public Program Root
@@ -115,9 +115,9 @@ partial class Composition
       get
       {
         var stateFunc = new Func<State>(() => {
-              if (_random == null)
-                lock (_lock)
-                  if (_random == null)
+              if (_random is null)
+                using (_lockM11D21di.EnterScope())
+                  if (_random is null)
                     _random = new Random();
 
               return (State)_random.Next(2)
@@ -1001,16 +1001,16 @@ Articles
 <summary>Array</summary>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Median</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>168.1 ns</td><td>1.72 ns</td><td>1.44 ns</td><td>1.00</td><td>0.00</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>169.6 ns</td><td>3.08 ns</td><td>2.58 ns</td><td>1.01</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>170.7 ns</td><td>3.02 ns</td><td>2.52 ns</td><td>1.02</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>171.2 ns</td><td>2.44 ns</td><td>2.04 ns</td><td>1.02</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>LightInject</td><td>179.8 ns</td><td>3.43 ns</td><td>3.21 ns</td><td>1.07</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>200.5 ns</td><td>3.89 ns</td><td>4.16 ns</td><td>1.20</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>Unity</td><td>9,966.0 ns</td><td>80.16 ns</td><td>62.58 ns</td><td>59.26</td><td>0.42</td><td>0.7629</td><td>-</td><td>14520 B</td><td>22.97</td>
-</tr><tr><td>Autofac</td><td>27,170.5 ns</td><td>308.31 ns</td><td>257.45 ns</td><td>161.60</td><td>1.87</td><td>1.5259</td><td>0.0610</td><td>28816 B</td><td>45.59</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>88.33 ns</td><td>1.075 ns</td><td>1.006 ns</td><td>88.58 ns</td><td>0.94</td><td>0.03</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>91.94 ns</td><td>1.832 ns</td><td>2.445 ns</td><td>91.66 ns</td><td>0.98</td><td>0.04</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>92.65 ns</td><td>2.244 ns</td><td>6.366 ns</td><td>89.18 ns</td><td>0.98</td><td>0.07</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>94.24 ns</td><td>1.883 ns</td><td>2.578 ns</td><td>94.06 ns</td><td>1.00</td><td>0.04</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>99.10 ns</td><td>0.999 ns</td><td>0.834 ns</td><td>98.91 ns</td><td>1.05</td><td>0.03</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>LightInject</td><td>103.24 ns</td><td>2.119 ns</td><td>4.183 ns</td><td>102.65 ns</td><td>1.10</td><td>0.05</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>Unity</td><td>4,510.09 ns</td><td>74.628 ns</td><td>66.155 ns</td><td>4,488.31 ns</td><td>47.89</td><td>1.47</td><td>0.8621</td><td>0.0076</td><td>14520 B</td><td>22.97</td>
+</tr><tr><td>Autofac</td><td>15,134.66 ns</td><td>110.608 ns</td><td>86.355 ns</td><td>15,131.24 ns</td><td>160.72</td><td>4.45</td><td>1.7090</td><td>0.0610</td><td>28976 B</td><td>45.85</td>
 </tr></tbody></table>
 
 [Array details](readme/ArrayDetails.md)
@@ -1021,17 +1021,17 @@ Articles
 <summary>Enum</summary>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Median</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>128.2 ns</td><td>1.50 ns</td><td>1.25 ns</td><td>0.91</td><td>0.01</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>130.5 ns</td><td>2.22 ns</td><td>1.85 ns</td><td>0.93</td><td>0.02</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>133.8 ns</td><td>2.38 ns</td><td>1.99 ns</td><td>0.95</td><td>0.01</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>140.3 ns</td><td>1.69 ns</td><td>1.41 ns</td><td>1.00</td><td>0.00</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>181.3 ns</td><td>2.01 ns</td><td>1.67 ns</td><td>1.29</td><td>0.02</td><td>0.0250</td><td>-</td><td>472 B</td><td>1.37</td>
-</tr><tr><td>LightInject</td><td>277.7 ns</td><td>3.47 ns</td><td>2.89 ns</td><td>1.98</td><td>0.03</td><td>0.0458</td><td>-</td><td>856 B</td><td>2.49</td>
-</tr><tr><td>DryIoc</td><td>281.7 ns</td><td>5.33 ns</td><td>4.45 ns</td><td>2.01</td><td>0.03</td><td>0.0458</td><td>-</td><td>856 B</td><td>2.49</td>
-</tr><tr><td>Unity</td><td>7,768.1 ns</td><td>124.10 ns</td><td>152.41 ns</td><td>55.43</td><td>1.24</td><td>0.7324</td><td>-</td><td>13752 B</td><td>39.98</td>
-</tr><tr><td>Autofac</td><td>26,954.8 ns</td><td>529.73 ns</td><td>543.99 ns</td><td>192.63</td><td>4.87</td><td>1.5259</td><td>0.0610</td><td>28944 B</td><td>84.14</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>64.36 ns</td><td>1.282 ns</td><td>2.919 ns</td><td>62.75 ns</td><td>1.00</td><td>0.05</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>64.49 ns</td><td>0.791 ns</td><td>0.661 ns</td><td>64.47 ns</td><td>1.00</td><td>0.01</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>65.26 ns</td><td>0.965 ns</td><td>0.903 ns</td><td>65.56 ns</td><td>1.01</td><td>0.02</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>65.43 ns</td><td>1.004 ns</td><td>0.784 ns</td><td>65.23 ns</td><td>1.01</td><td>0.02</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>93.40 ns</td><td>1.322 ns</td><td>1.172 ns</td><td>92.96 ns</td><td>1.45</td><td>0.02</td><td>0.0281</td><td>-</td><td>472 B</td><td>1.37</td>
+</tr><tr><td>LightInject</td><td>147.58 ns</td><td>1.650 ns</td><td>1.544 ns</td><td>147.96 ns</td><td>2.29</td><td>0.03</td><td>0.0510</td><td>-</td><td>856 B</td><td>2.49</td>
+</tr><tr><td>DryIoc</td><td>147.61 ns</td><td>1.110 ns</td><td>0.984 ns</td><td>147.54 ns</td><td>2.29</td><td>0.03</td><td>0.0510</td><td>-</td><td>856 B</td><td>2.49</td>
+</tr><tr><td>Unity</td><td>3,736.48 ns</td><td>73.272 ns</td><td>68.539 ns</td><td>3,739.88 ns</td><td>57.94</td><td>1.18</td><td>0.8202</td><td>0.0076</td><td>13752 B</td><td>39.98</td>
+</tr><tr><td>Autofac</td><td>15,610.79 ns</td><td>288.580 ns</td><td>595.967 ns</td><td>15,436.50 ns</td><td>242.08</td><td>9.47</td><td>1.7395</td><td>0.0610</td><td>29104 B</td><td>84.60</td>
 </tr></tbody></table>
 
 [Enum details](readme/EnumDetails.md)
@@ -1042,16 +1042,16 @@ Articles
 <summary>Func</summary>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean   </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>8.002 ns</td><td>0.1496 ns</td><td>0.1326 ns</td><td>0.85</td><td>0.01</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>9.445 ns</td><td>0.1727 ns</td><td>0.1615 ns</td><td>1.00</td><td>0.00</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>10.327 ns</td><td>0.2801 ns</td><td>0.2620 ns</td><td>1.09</td><td>0.02</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>11.954 ns</td><td>0.2458 ns</td><td>0.2053 ns</td><td>1.26</td><td>0.03</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>62.785 ns</td><td>1.1086 ns</td><td>0.9828 ns</td><td>6.65</td><td>0.19</td><td>0.0063</td><td>120 B</td><td>5.00</td>
-</tr><tr><td>LightInject</td><td>296.638 ns</td><td>3.9363 ns</td><td>3.2870 ns</td><td>31.37</td><td>0.80</td><td>0.0267</td><td>504 B</td><td>21.00</td>
-</tr><tr><td>Unity</td><td>4,448.473 ns</td><td>35.3598 ns</td><td>33.0756 ns</td><td>471.11</td><td>9.33</td><td>0.1297</td><td>2552 B</td><td>106.33</td>
-</tr><tr><td>Autofac</td><td>10,857.806 ns</td><td>115.9508 ns</td><td>96.8241 ns</td><td>1,147.95</td><td>22.40</td><td>0.7477</td><td>14008 B</td><td>583.67</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>4.382 ns</td><td>0.0561 ns</td><td>0.0525 ns</td><td>0.84</td><td>0.01</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>5.193 ns</td><td>0.0649 ns</td><td>0.0542 ns</td><td>1.00</td><td>0.01</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>5.914 ns</td><td>0.0753 ns</td><td>0.0667 ns</td><td>1.14</td><td>0.02</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>6.375 ns</td><td>0.0465 ns</td><td>0.0388 ns</td><td>1.23</td><td>0.01</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>28.979 ns</td><td>0.3875 ns</td><td>0.3435 ns</td><td>5.58</td><td>0.08</td><td>0.0072</td><td>-</td><td>120 B</td><td>5.00</td>
+</tr><tr><td>LightInject</td><td>155.185 ns</td><td>2.9628 ns</td><td>2.7714 ns</td><td>29.89</td><td>0.60</td><td>0.0300</td><td>-</td><td>504 B</td><td>21.00</td>
+</tr><tr><td>Unity</td><td>1,760.400 ns</td><td>12.4774 ns</td><td>11.6714 ns</td><td>339.03</td><td>3.99</td><td>0.1507</td><td>-</td><td>2552 B</td><td>106.33</td>
+</tr><tr><td>Autofac</td><td>5,745.474 ns</td><td>36.1642 ns</td><td>30.1988 ns</td><td>1,106.51</td><td>12.28</td><td>0.8316</td><td>0.0076</td><td>14008 B</td><td>583.67</td>
 </tr></tbody></table>
 
 [Func details](readme/FuncDetails.md)
@@ -1062,20 +1062,20 @@ Articles
 <summary>Singleton</summary>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean    </th><th>Error  </th><th>StdDev </th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean   </th><th>Error  </th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Hand Coded&#39;</td><td>7.600 ns</td><td>0.1685 ns</td><td>0.1316 ns</td><td>1.00</td><td>0.00</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>8.652 ns</td><td>0.2436 ns</td><td>0.2392 ns</td><td>1.14</td><td>0.03</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>9.919 ns</td><td>0.2579 ns</td><td>0.2154 ns</td><td>1.30</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>11.393 ns</td><td>0.2199 ns</td><td>0.1836 ns</td><td>1.50</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>27.581 ns</td><td>0.3758 ns</td><td>0.3138 ns</td><td>3.63</td><td>0.07</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Simple Injector&#39;</td><td>33.807 ns</td><td>0.3441 ns</td><td>0.3050 ns</td><td>4.45</td><td>0.10</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>38.478 ns</td><td>0.3053 ns</td><td>0.2549 ns</td><td>5.06</td><td>0.07</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>LightInject</td><td>865.775 ns</td><td>1.2567 ns</td><td>1.0494 ns</td><td>113.96</td><td>1.96</td><td>0.0010</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>Unity</td><td>7,677.459 ns</td><td>99.8336 ns</td><td>88.4999 ns</td><td>1,011.67</td><td>17.40</td><td>0.1678</td><td>-</td><td>3184 B</td><td>132.67</td>
-</tr><tr><td>Autofac</td><td>18,825.341 ns</td><td>315.1815 ns</td><td>263.1908 ns</td><td>2,478.00</td><td>62.67</td><td>1.2817</td><td>0.0305</td><td>24208 B</td><td>1,008.67</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>31,318.225 ns</td><td>408.7010 ns</td><td>362.3028 ns</td><td>4,123.56</td><td>74.24</td><td>1.2207</td><td>-</td><td>23912 B</td><td>996.33</td>
-</tr><tr><td>Ninject</td><td>116,099.082 ns</td><td>2,240.6371 ns</td><td>2,991.1861 ns</td><td>15,609.54</td><td>360.85</td><td>3.9063</td><td>0.9766</td><td>74096 B</td><td>3,087.33</td>
+</thead><tbody><tr><td>&#39;Hand Coded&#39;</td><td>3.016 ns</td><td>0.0721 ns</td><td>0.0602 ns</td><td>1.00</td><td>0.03</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>3.337 ns</td><td>0.0778 ns</td><td>0.0728 ns</td><td>1.11</td><td>0.03</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>3.517 ns</td><td>0.0602 ns</td><td>0.0533 ns</td><td>1.17</td><td>0.03</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>4.649 ns</td><td>0.1417 ns</td><td>0.3832 ns</td><td>1.54</td><td>0.13</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>11.388 ns</td><td>0.0389 ns</td><td>0.0304 ns</td><td>3.78</td><td>0.07</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Simple Injector&#39;</td><td>16.630 ns</td><td>0.0782 ns</td><td>0.0693 ns</td><td>5.52</td><td>0.11</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>19.551 ns</td><td>0.0684 ns</td><td>0.0606 ns</td><td>6.49</td><td>0.12</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>LightInject</td><td>426.861 ns</td><td>1.0945 ns</td><td>0.9702 ns</td><td>141.59</td><td>2.70</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>Unity</td><td>2,645.530 ns</td><td>47.7345 ns</td><td>66.9171 ns</td><td>877.51</td><td>27.40</td><td>0.1869</td><td>-</td><td>3184 B</td><td>132.67</td>
+</tr><tr><td>Autofac</td><td>9,723.452 ns</td><td>60.9124 ns</td><td>53.9972 ns</td><td>3,225.24</td><td>63.41</td><td>1.4343</td><td>0.0458</td><td>24208 B</td><td>1,008.67</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>16,991.331 ns</td><td>93.5701 ns</td><td>87.5255 ns</td><td>5,635.97</td><td>110.23</td><td>1.4038</td><td>-</td><td>23912 B</td><td>996.33</td>
+</tr><tr><td>Ninject</td><td>67,297.995 ns</td><td>1,045.7465 ns</td><td>927.0271 ns</td><td>22,322.54</td><td>516.33</td><td>4.2725</td><td>1.0986</td><td>73176 B</td><td>3,049.00</td>
 </tr></tbody></table>
 
 [Singleton details](readme/SingletonDetails.md)
@@ -1088,18 +1088,18 @@ Articles
 <table>
 <thead><tr><th>Method              </th><th>Mean    </th><th>Error  </th><th>StdDev </th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Pure.DI composition root&#39;</td><td>7.903 ns</td><td>0.1254 ns</td><td>0.0979 ns</td><td>0.97</td><td>0.02</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>8.135 ns</td><td>0.1484 ns</td><td>0.1158 ns</td><td>1.00</td><td>0.00</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>10.337 ns</td><td>0.2882 ns</td><td>0.3848 ns</td><td>1.28</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>11.442 ns</td><td>0.2251 ns</td><td>0.1995 ns</td><td>1.41</td><td>0.03</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>LightInject</td><td>20.096 ns</td><td>0.0607 ns</td><td>0.0507 ns</td><td>2.47</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>25.671 ns</td><td>0.1087 ns</td><td>0.0849 ns</td><td>3.16</td><td>0.05</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>27.474 ns</td><td>0.5736 ns</td><td>0.4478 ns</td><td>3.38</td><td>0.07</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Simple Injector&#39;</td><td>34.814 ns</td><td>0.2384 ns</td><td>0.2114 ns</td><td>4.28</td><td>0.05</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>Unity</td><td>11,090.606 ns</td><td>65.9897 ns</td><td>61.7268 ns</td><td>1,366.08</td><td>19.49</td><td>0.2747</td><td>-</td><td>5176 B</td><td>215.67</td>
-</tr><tr><td>Autofac</td><td>28,646.903 ns</td><td>355.7947 ns</td><td>315.4027 ns</td><td>3,520.24</td><td>61.91</td><td>1.7700</td><td>0.0916</td><td>33224 B</td><td>1,384.33</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>58,534.573 ns</td><td>988.3103 ns</td><td>876.1114 ns</td><td>7,196.49</td><td>162.41</td><td>2.8687</td><td>-</td><td>54360 B</td><td>2,265.00</td>
-</tr><tr><td>Ninject</td><td>253,820.129 ns</td><td>4,777.4163 ns</td><td>5,310.0855 ns</td><td>31,080.38</td><td>673.81</td><td>6.8359</td><td>1.4648</td><td>131008 B</td><td>5,458.67</td>
+</thead><tbody><tr><td>&#39;Pure.DI composition root&#39;</td><td>3.491 ns</td><td>0.1203 ns</td><td>0.2764 ns</td><td>0.97</td><td>0.09</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>3.619 ns</td><td>0.1132 ns</td><td>0.1952 ns</td><td>1.00</td><td>0.07</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>4.417 ns</td><td>0.1377 ns</td><td>0.3429 ns</td><td>1.22</td><td>0.11</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>4.649 ns</td><td>0.1431 ns</td><td>0.1338 ns</td><td>1.29</td><td>0.08</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>LightInject</td><td>7.043 ns</td><td>0.0902 ns</td><td>0.0754 ns</td><td>1.95</td><td>0.10</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>10.357 ns</td><td>0.1357 ns</td><td>0.1133 ns</td><td>2.87</td><td>0.15</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>10.673 ns</td><td>0.1197 ns</td><td>0.1119 ns</td><td>2.96</td><td>0.16</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Simple Injector&#39;</td><td>14.594 ns</td><td>0.1373 ns</td><td>0.1217 ns</td><td>4.04</td><td>0.21</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>Unity</td><td>4,320.577 ns</td><td>85.0619 ns</td><td>175.6675 ns</td><td>1,197.13</td><td>78.58</td><td>0.3052</td><td>-</td><td>5176 B</td><td>215.67</td>
+</tr><tr><td>Autofac</td><td>12,616.111 ns</td><td>227.4971 ns</td><td>201.6703 ns</td><td>3,495.62</td><td>189.02</td><td>1.9836</td><td>0.0916</td><td>33224 B</td><td>1,384.33</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>27,766.858 ns</td><td>312.7020 ns</td><td>277.2021 ns</td><td>7,693.52</td><td>405.54</td><td>3.2349</td><td>0.0305</td><td>54360 B</td><td>2,265.00</td>
+</tr><tr><td>Ninject</td><td>148,286.554 ns</td><td>3,309.2559 ns</td><td>9,600.7521 ns</td><td>41,086.58</td><td>3,398.59</td><td>7.5684</td><td>1.4648</td><td>128736 B</td><td>5,364.00</td>
 </tr></tbody></table>
 
 [Transient details](readme/TransientDetails.md)
@@ -1110,11 +1110,11 @@ Articles
 <summary>Benchmarks environment</summary>
 
 <pre><code>
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
-  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-  DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4894/22H2/2022Update)
+AMD Ryzen 9 5900X, 1 CPU, 24 logical and 12 physical cores
+.NET SDK 9.0.100
+  [Host]     : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
+  DefaultJob : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
 </code></pre>
 
 </details>
diff --git a/benchmarks/Pure.DI.Benchmarks/Pure.DI.Benchmarks.csproj b/benchmarks/Pure.DI.Benchmarks/Pure.DI.Benchmarks.csproj
index 6db26662..b34c2cd0 100644
--- a/benchmarks/Pure.DI.Benchmarks/Pure.DI.Benchmarks.csproj
+++ b/benchmarks/Pure.DI.Benchmarks/Pure.DI.Benchmarks.csproj
@@ -17,14 +17,14 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
         <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
         <PackageReference Include="IoC.Container" Version="1.3.8" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="SimpleInjector" Version="5.5.0" />
         <PackageReference Include="Unity" Version="5.11.10" />
         <PackageReference Include="DryIoc.dll" Version="5.4.3" />
         <PackageReference Include="Autofac" Version="8.1.1" />
-        <PackageReference Include="LightInject" Version="6.6.4" />
+        <PackageReference Include="LightInject" Version="7.0.1" />
         <PackageReference Include="Ninject" Version="3.3.6" />
         <PackageReference Include="Castle.Windsor" Version="6.0.0" />
     </ItemGroup>
diff --git a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Array-report.html b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Array-report.html
index 4c103345..aea9958e 100644
--- a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Array-report.html
+++ b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Array-report.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <head>
 <meta charset='utf-8' />
-<title>Pure.DI.Benchmarks.Benchmarks.Array-20240420-074640</title>
+<title>Pure.DI.Benchmarks.Benchmarks.Array-20241121-115600</title>
 
 <style type="text/css">
 	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -13,29 +13,29 @@
 </head>
 <body>
 <pre><code>
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
-  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-  DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4894/22H2/2022Update)
+AMD Ryzen 9 5900X, 1 CPU, 24 logical and 12 physical cores
+.NET SDK 9.0.100
+  [Host]     : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
+  DefaultJob : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
 </code></pre>
 <pre><code></code></pre>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Median</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Simple Injector&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>Ninject</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>168.1 ns</td><td>1.72 ns</td><td>1.44 ns</td><td>1.00</td><td>0.00</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>169.6 ns</td><td>3.08 ns</td><td>2.58 ns</td><td>1.01</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>170.7 ns</td><td>3.02 ns</td><td>2.52 ns</td><td>1.02</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>171.2 ns</td><td>2.44 ns</td><td>2.04 ns</td><td>1.02</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>LightInject</td><td>179.8 ns</td><td>3.43 ns</td><td>3.21 ns</td><td>1.07</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>200.5 ns</td><td>3.89 ns</td><td>4.16 ns</td><td>1.20</td><td>0.02</td><td>0.0336</td><td>-</td><td>632 B</td><td>1.00</td>
-</tr><tr><td>Unity</td><td>9,966.0 ns</td><td>80.16 ns</td><td>62.58 ns</td><td>59.26</td><td>0.42</td><td>0.7629</td><td>-</td><td>14520 B</td><td>22.97</td>
-</tr><tr><td>Autofac</td><td>27,170.5 ns</td><td>308.31 ns</td><td>257.45 ns</td><td>161.60</td><td>1.87</td><td>1.5259</td><td>0.0610</td><td>28816 B</td><td>45.59</td>
+</thead><tbody><tr><td>&#39;Simple Injector&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>Ninject</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>88.33 ns</td><td>1.075 ns</td><td>1.006 ns</td><td>88.58 ns</td><td>0.94</td><td>0.03</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>91.94 ns</td><td>1.832 ns</td><td>2.445 ns</td><td>91.66 ns</td><td>0.98</td><td>0.04</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>92.65 ns</td><td>2.244 ns</td><td>6.366 ns</td><td>89.18 ns</td><td>0.98</td><td>0.07</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>94.24 ns</td><td>1.883 ns</td><td>2.578 ns</td><td>94.06 ns</td><td>1.00</td><td>0.04</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>99.10 ns</td><td>0.999 ns</td><td>0.834 ns</td><td>98.91 ns</td><td>1.05</td><td>0.03</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>LightInject</td><td>103.24 ns</td><td>2.119 ns</td><td>4.183 ns</td><td>102.65 ns</td><td>1.10</td><td>0.05</td><td>0.0377</td><td>-</td><td>632 B</td><td>1.00</td>
+</tr><tr><td>Unity</td><td>4,510.09 ns</td><td>74.628 ns</td><td>66.155 ns</td><td>4,488.31 ns</td><td>47.89</td><td>1.47</td><td>0.8621</td><td>0.0076</td><td>14520 B</td><td>22.97</td>
+</tr><tr><td>Autofac</td><td>15,134.66 ns</td><td>110.608 ns</td><td>86.355 ns</td><td>15,131.24 ns</td><td>160.72</td><td>4.45</td><td>1.7090</td><td>0.0610</td><td>28976 B</td><td>45.85</td>
 </tr></tbody></table>
 </body>
 </html>
diff --git a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Enum-report.html b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Enum-report.html
index 03ad92ea..f5a50579 100644
--- a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Enum-report.html
+++ b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Enum-report.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <head>
 <meta charset='utf-8' />
-<title>Pure.DI.Benchmarks.Benchmarks.Enum-20240420-074943</title>
+<title>Pure.DI.Benchmarks.Benchmarks.Enum-20241121-120008</title>
 
 <style type="text/css">
 	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -13,29 +13,29 @@
 </head>
 <body>
 <pre><code>
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
-  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-  DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4894/22H2/2022Update)
+AMD Ryzen 9 5900X, 1 CPU, 24 logical and 12 physical cores
+.NET SDK 9.0.100
+  [Host]     : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
+  DefaultJob : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
 </code></pre>
 <pre><code></code></pre>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Median</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Simple Injector&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>Ninject</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>128.2 ns</td><td>1.50 ns</td><td>1.25 ns</td><td>0.91</td><td>0.01</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>130.5 ns</td><td>2.22 ns</td><td>1.85 ns</td><td>0.93</td><td>0.02</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>133.8 ns</td><td>2.38 ns</td><td>1.99 ns</td><td>0.95</td><td>0.01</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>140.3 ns</td><td>1.69 ns</td><td>1.41 ns</td><td>1.00</td><td>0.00</td><td>0.0184</td><td>-</td><td>344 B</td><td>1.00</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>181.3 ns</td><td>2.01 ns</td><td>1.67 ns</td><td>1.29</td><td>0.02</td><td>0.0250</td><td>-</td><td>472 B</td><td>1.37</td>
-</tr><tr><td>LightInject</td><td>277.7 ns</td><td>3.47 ns</td><td>2.89 ns</td><td>1.98</td><td>0.03</td><td>0.0458</td><td>-</td><td>856 B</td><td>2.49</td>
-</tr><tr><td>DryIoc</td><td>281.7 ns</td><td>5.33 ns</td><td>4.45 ns</td><td>2.01</td><td>0.03</td><td>0.0458</td><td>-</td><td>856 B</td><td>2.49</td>
-</tr><tr><td>Unity</td><td>7,768.1 ns</td><td>124.10 ns</td><td>152.41 ns</td><td>55.43</td><td>1.24</td><td>0.7324</td><td>-</td><td>13752 B</td><td>39.98</td>
-</tr><tr><td>Autofac</td><td>26,954.8 ns</td><td>529.73 ns</td><td>543.99 ns</td><td>192.63</td><td>4.87</td><td>1.5259</td><td>0.0610</td><td>28944 B</td><td>84.14</td>
+</thead><tbody><tr><td>&#39;Simple Injector&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>Ninject</td><td>NA</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>64.36 ns</td><td>1.282 ns</td><td>2.919 ns</td><td>62.75 ns</td><td>1.00</td><td>0.05</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>64.49 ns</td><td>0.791 ns</td><td>0.661 ns</td><td>64.47 ns</td><td>1.00</td><td>0.01</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>65.26 ns</td><td>0.965 ns</td><td>0.903 ns</td><td>65.56 ns</td><td>1.01</td><td>0.02</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>65.43 ns</td><td>1.004 ns</td><td>0.784 ns</td><td>65.23 ns</td><td>1.01</td><td>0.02</td><td>0.0205</td><td>-</td><td>344 B</td><td>1.00</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>93.40 ns</td><td>1.322 ns</td><td>1.172 ns</td><td>92.96 ns</td><td>1.45</td><td>0.02</td><td>0.0281</td><td>-</td><td>472 B</td><td>1.37</td>
+</tr><tr><td>LightInject</td><td>147.58 ns</td><td>1.650 ns</td><td>1.544 ns</td><td>147.96 ns</td><td>2.29</td><td>0.03</td><td>0.0510</td><td>-</td><td>856 B</td><td>2.49</td>
+</tr><tr><td>DryIoc</td><td>147.61 ns</td><td>1.110 ns</td><td>0.984 ns</td><td>147.54 ns</td><td>2.29</td><td>0.03</td><td>0.0510</td><td>-</td><td>856 B</td><td>2.49</td>
+</tr><tr><td>Unity</td><td>3,736.48 ns</td><td>73.272 ns</td><td>68.539 ns</td><td>3,739.88 ns</td><td>57.94</td><td>1.18</td><td>0.8202</td><td>0.0076</td><td>13752 B</td><td>39.98</td>
+</tr><tr><td>Autofac</td><td>15,610.79 ns</td><td>288.580 ns</td><td>595.967 ns</td><td>15,436.50 ns</td><td>242.08</td><td>9.47</td><td>1.7395</td><td>0.0610</td><td>29104 B</td><td>84.60</td>
 </tr></tbody></table>
 </body>
 </html>
diff --git a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Func-report.html b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Func-report.html
index 92935782..77d27365 100644
--- a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Func-report.html
+++ b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Func-report.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <head>
 <meta charset='utf-8' />
-<title>Pure.DI.Benchmarks.Benchmarks.Func-20240420-075230</title>
+<title>Pure.DI.Benchmarks.Benchmarks.Func-20241121-120352</title>
 
 <style type="text/css">
 	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -13,29 +13,29 @@
 </head>
 <body>
 <pre><code>
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
-  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-  DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4894/22H2/2022Update)
+AMD Ryzen 9 5900X, 1 CPU, 24 logical and 12 physical cores
+.NET SDK 9.0.100
+  [Host]     : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
+  DefaultJob : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
 </code></pre>
 <pre><code></code></pre>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean   </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Simple Injector&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>Ninject</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>?</td>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>8.002 ns</td><td>0.1496 ns</td><td>0.1326 ns</td><td>0.85</td><td>0.01</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>9.445 ns</td><td>0.1727 ns</td><td>0.1615 ns</td><td>1.00</td><td>0.00</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>10.327 ns</td><td>0.2801 ns</td><td>0.2620 ns</td><td>1.09</td><td>0.02</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>11.954 ns</td><td>0.2458 ns</td><td>0.2053 ns</td><td>1.26</td><td>0.03</td><td>0.0013</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>62.785 ns</td><td>1.1086 ns</td><td>0.9828 ns</td><td>6.65</td><td>0.19</td><td>0.0063</td><td>120 B</td><td>5.00</td>
-</tr><tr><td>LightInject</td><td>296.638 ns</td><td>3.9363 ns</td><td>3.2870 ns</td><td>31.37</td><td>0.80</td><td>0.0267</td><td>504 B</td><td>21.00</td>
-</tr><tr><td>Unity</td><td>4,448.473 ns</td><td>35.3598 ns</td><td>33.0756 ns</td><td>471.11</td><td>9.33</td><td>0.1297</td><td>2552 B</td><td>106.33</td>
-</tr><tr><td>Autofac</td><td>10,857.806 ns</td><td>115.9508 ns</td><td>96.8241 ns</td><td>1,147.95</td><td>22.40</td><td>0.7477</td><td>14008 B</td><td>583.67</td>
+</thead><tbody><tr><td>&#39;Simple Injector&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>Ninject</td><td>NA</td><td>NA</td><td>NA</td><td>?</td><td>?</td><td>NA</td><td>NA</td><td>NA</td><td>?</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>4.382 ns</td><td>0.0561 ns</td><td>0.0525 ns</td><td>0.84</td><td>0.01</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>5.193 ns</td><td>0.0649 ns</td><td>0.0542 ns</td><td>1.00</td><td>0.01</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>5.914 ns</td><td>0.0753 ns</td><td>0.0667 ns</td><td>1.14</td><td>0.02</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>6.375 ns</td><td>0.0465 ns</td><td>0.0388 ns</td><td>1.23</td><td>0.01</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>28.979 ns</td><td>0.3875 ns</td><td>0.3435 ns</td><td>5.58</td><td>0.08</td><td>0.0072</td><td>-</td><td>120 B</td><td>5.00</td>
+</tr><tr><td>LightInject</td><td>155.185 ns</td><td>2.9628 ns</td><td>2.7714 ns</td><td>29.89</td><td>0.60</td><td>0.0300</td><td>-</td><td>504 B</td><td>21.00</td>
+</tr><tr><td>Unity</td><td>1,760.400 ns</td><td>12.4774 ns</td><td>11.6714 ns</td><td>339.03</td><td>3.99</td><td>0.1507</td><td>-</td><td>2552 B</td><td>106.33</td>
+</tr><tr><td>Autofac</td><td>5,745.474 ns</td><td>36.1642 ns</td><td>30.1988 ns</td><td>1,106.51</td><td>12.28</td><td>0.8316</td><td>0.0076</td><td>14008 B</td><td>583.67</td>
 </tr></tbody></table>
 </body>
 </html>
diff --git a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html
index ca6e6756..a5e1c836 100644
--- a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html
+++ b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <head>
 <meta charset='utf-8' />
-<title>Pure.DI.Benchmarks.Benchmarks.Singleton-20240420-075533</title>
+<title>Pure.DI.Benchmarks.Benchmarks.Singleton-20241121-120646</title>
 
 <style type="text/css">
 	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -13,29 +13,29 @@
 </head>
 <body>
 <pre><code>
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
-  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-  DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4894/22H2/2022Update)
+AMD Ryzen 9 5900X, 1 CPU, 24 logical and 12 physical cores
+.NET SDK 9.0.100
+  [Host]     : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
+  DefaultJob : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
 </code></pre>
 <pre><code></code></pre>
 
 <table>
-<thead><tr><th>Method              </th><th>Mean    </th><th>Error  </th><th>StdDev </th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
+<thead><tr><th>Method              </th><th>Mean   </th><th>Error  </th><th>StdDev</th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Hand Coded&#39;</td><td>7.600 ns</td><td>0.1685 ns</td><td>0.1316 ns</td><td>1.00</td><td>0.00</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>8.652 ns</td><td>0.2436 ns</td><td>0.2392 ns</td><td>1.14</td><td>0.03</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>9.919 ns</td><td>0.2579 ns</td><td>0.2154 ns</td><td>1.30</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>11.393 ns</td><td>0.2199 ns</td><td>0.1836 ns</td><td>1.50</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>27.581 ns</td><td>0.3758 ns</td><td>0.3138 ns</td><td>3.63</td><td>0.07</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Simple Injector&#39;</td><td>33.807 ns</td><td>0.3441 ns</td><td>0.3050 ns</td><td>4.45</td><td>0.10</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>38.478 ns</td><td>0.3053 ns</td><td>0.2549 ns</td><td>5.06</td><td>0.07</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>LightInject</td><td>865.775 ns</td><td>1.2567 ns</td><td>1.0494 ns</td><td>113.96</td><td>1.96</td><td>0.0010</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>Unity</td><td>7,677.459 ns</td><td>99.8336 ns</td><td>88.4999 ns</td><td>1,011.67</td><td>17.40</td><td>0.1678</td><td>-</td><td>3184 B</td><td>132.67</td>
-</tr><tr><td>Autofac</td><td>18,825.341 ns</td><td>315.1815 ns</td><td>263.1908 ns</td><td>2,478.00</td><td>62.67</td><td>1.2817</td><td>0.0305</td><td>24208 B</td><td>1,008.67</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>31,318.225 ns</td><td>408.7010 ns</td><td>362.3028 ns</td><td>4,123.56</td><td>74.24</td><td>1.2207</td><td>-</td><td>23912 B</td><td>996.33</td>
-</tr><tr><td>Ninject</td><td>116,099.082 ns</td><td>2,240.6371 ns</td><td>2,991.1861 ns</td><td>15,609.54</td><td>360.85</td><td>3.9063</td><td>0.9766</td><td>74096 B</td><td>3,087.33</td>
+</thead><tbody><tr><td>&#39;Hand Coded&#39;</td><td>3.016 ns</td><td>0.0721 ns</td><td>0.0602 ns</td><td>1.00</td><td>0.03</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI composition root&#39;</td><td>3.337 ns</td><td>0.0778 ns</td><td>0.0728 ns</td><td>1.11</td><td>0.03</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>3.517 ns</td><td>0.0602 ns</td><td>0.0533 ns</td><td>1.17</td><td>0.03</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>4.649 ns</td><td>0.1417 ns</td><td>0.3832 ns</td><td>1.54</td><td>0.13</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>11.388 ns</td><td>0.0389 ns</td><td>0.0304 ns</td><td>3.78</td><td>0.07</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Simple Injector&#39;</td><td>16.630 ns</td><td>0.0782 ns</td><td>0.0693 ns</td><td>5.52</td><td>0.11</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>19.551 ns</td><td>0.0684 ns</td><td>0.0606 ns</td><td>6.49</td><td>0.12</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>LightInject</td><td>426.861 ns</td><td>1.0945 ns</td><td>0.9702 ns</td><td>141.59</td><td>2.70</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>Unity</td><td>2,645.530 ns</td><td>47.7345 ns</td><td>66.9171 ns</td><td>877.51</td><td>27.40</td><td>0.1869</td><td>-</td><td>3184 B</td><td>132.67</td>
+</tr><tr><td>Autofac</td><td>9,723.452 ns</td><td>60.9124 ns</td><td>53.9972 ns</td><td>3,225.24</td><td>63.41</td><td>1.4343</td><td>0.0458</td><td>24208 B</td><td>1,008.67</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>16,991.331 ns</td><td>93.5701 ns</td><td>87.5255 ns</td><td>5,635.97</td><td>110.23</td><td>1.4038</td><td>-</td><td>23912 B</td><td>996.33</td>
+</tr><tr><td>Ninject</td><td>67,297.995 ns</td><td>1,045.7465 ns</td><td>927.0271 ns</td><td>22,322.54</td><td>516.33</td><td>4.2725</td><td>1.0986</td><td>73176 B</td><td>3,049.00</td>
 </tr></tbody></table>
 </body>
 </html>
diff --git a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Transient-report.html b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Transient-report.html
index 2c0cd9a8..b749edfa 100644
--- a/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Transient-report.html
+++ b/benchmarks/data/Pure.DI.Benchmarks.Benchmarks.Transient-report.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <head>
 <meta charset='utf-8' />
-<title>Pure.DI.Benchmarks.Benchmarks.Transient-20240420-080021</title>
+<title>Pure.DI.Benchmarks.Benchmarks.Transient-20241121-121202</title>
 
 <style type="text/css">
 	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -13,29 +13,29 @@
 </head>
 <body>
 <pre><code>
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
-  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-  DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4894/22H2/2022Update)
+AMD Ryzen 9 5900X, 1 CPU, 24 logical and 12 physical cores
+.NET SDK 9.0.100
+  [Host]     : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
+  DefaultJob : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
 </code></pre>
 <pre><code></code></pre>
 
 <table>
 <thead><tr><th>Method              </th><th>Mean    </th><th>Error  </th><th>StdDev </th><th>Ratio</th><th>RatioSD</th><th>Gen0</th><th>Gen1</th><th>Allocated</th><th>Alloc Ratio</th>
 </tr>
-</thead><tbody><tr><td>&#39;Pure.DI composition root&#39;</td><td>7.903 ns</td><td>0.1254 ns</td><td>0.0979 ns</td><td>0.97</td><td>0.02</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Hand Coded&#39;</td><td>8.135 ns</td><td>0.1484 ns</td><td>0.1158 ns</td><td>1.00</td><td>0.00</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>10.337 ns</td><td>0.2882 ns</td><td>0.3848 ns</td><td>1.28</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>11.442 ns</td><td>0.2251 ns</td><td>0.1995 ns</td><td>1.41</td><td>0.03</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>LightInject</td><td>20.096 ns</td><td>0.0607 ns</td><td>0.0507 ns</td><td>2.47</td><td>0.04</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Microsoft DI&#39;</td><td>25.671 ns</td><td>0.1087 ns</td><td>0.0849 ns</td><td>3.16</td><td>0.05</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>DryIoc</td><td>27.474 ns</td><td>0.5736 ns</td><td>0.4478 ns</td><td>3.38</td><td>0.07</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>&#39;Simple Injector&#39;</td><td>34.814 ns</td><td>0.2384 ns</td><td>0.2114 ns</td><td>4.28</td><td>0.05</td><td>0.0013</td><td>-</td><td>24 B</td><td>1.00</td>
-</tr><tr><td>Unity</td><td>11,090.606 ns</td><td>65.9897 ns</td><td>61.7268 ns</td><td>1,366.08</td><td>19.49</td><td>0.2747</td><td>-</td><td>5176 B</td><td>215.67</td>
-</tr><tr><td>Autofac</td><td>28,646.903 ns</td><td>355.7947 ns</td><td>315.4027 ns</td><td>3,520.24</td><td>61.91</td><td>1.7700</td><td>0.0916</td><td>33224 B</td><td>1,384.33</td>
-</tr><tr><td>&#39;Castle Windsor&#39;</td><td>58,534.573 ns</td><td>988.3103 ns</td><td>876.1114 ns</td><td>7,196.49</td><td>162.41</td><td>2.8687</td><td>-</td><td>54360 B</td><td>2,265.00</td>
-</tr><tr><td>Ninject</td><td>253,820.129 ns</td><td>4,777.4163 ns</td><td>5,310.0855 ns</td><td>31,080.38</td><td>673.81</td><td>6.8359</td><td>1.4648</td><td>131008 B</td><td>5,458.67</td>
+</thead><tbody><tr><td>&#39;Pure.DI composition root&#39;</td><td>3.491 ns</td><td>0.1203 ns</td><td>0.2764 ns</td><td>0.97</td><td>0.09</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Hand Coded&#39;</td><td>3.619 ns</td><td>0.1132 ns</td><td>0.1952 ns</td><td>1.00</td><td>0.07</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve&lt;T&gt;()&#39;</td><td>4.417 ns</td><td>0.1377 ns</td><td>0.3429 ns</td><td>1.22</td><td>0.11</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Pure.DI Resolve(Type)&#39;</td><td>4.649 ns</td><td>0.1431 ns</td><td>0.1338 ns</td><td>1.29</td><td>0.08</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>LightInject</td><td>7.043 ns</td><td>0.0902 ns</td><td>0.0754 ns</td><td>1.95</td><td>0.10</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Microsoft DI&#39;</td><td>10.357 ns</td><td>0.1357 ns</td><td>0.1133 ns</td><td>2.87</td><td>0.15</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>DryIoc</td><td>10.673 ns</td><td>0.1197 ns</td><td>0.1119 ns</td><td>2.96</td><td>0.16</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>&#39;Simple Injector&#39;</td><td>14.594 ns</td><td>0.1373 ns</td><td>0.1217 ns</td><td>4.04</td><td>0.21</td><td>0.0014</td><td>-</td><td>24 B</td><td>1.00</td>
+</tr><tr><td>Unity</td><td>4,320.577 ns</td><td>85.0619 ns</td><td>175.6675 ns</td><td>1,197.13</td><td>78.58</td><td>0.3052</td><td>-</td><td>5176 B</td><td>215.67</td>
+</tr><tr><td>Autofac</td><td>12,616.111 ns</td><td>227.4971 ns</td><td>201.6703 ns</td><td>3,495.62</td><td>189.02</td><td>1.9836</td><td>0.0916</td><td>33224 B</td><td>1,384.33</td>
+</tr><tr><td>&#39;Castle Windsor&#39;</td><td>27,766.858 ns</td><td>312.7020 ns</td><td>277.2021 ns</td><td>7,693.52</td><td>405.54</td><td>3.2349</td><td>0.0305</td><td>54360 B</td><td>2,265.00</td>
+</tr><tr><td>Ninject</td><td>148,286.554 ns</td><td>3,309.2559 ns</td><td>9,600.7521 ns</td><td>41,086.58</td><td>3,398.59</td><td>7.5684</td><td>1.4648</td><td>128736 B</td><td>5,364.00</td>
 </tr></tbody></table>
 </body>
 </html>
diff --git a/build/CompatibilityCheckTarget.cs b/build/CompatibilityCheckTarget.cs
index 6a077b95..3903b922 100644
--- a/build/CompatibilityCheckTarget.cs
+++ b/build/CompatibilityCheckTarget.cs
@@ -34,6 +34,7 @@ public async Task<IReadOnlyCollection<Package>> RunAsync(CancellationToken cance
 
         string[] frameworks =
         [
+            "net9.0",
             "net8.0",
             "net7.0",
             "net6.0",
diff --git a/build/ReadmeTarget.cs b/build/ReadmeTarget.cs
index 8c4aeb9a..34b3264e 100644
--- a/build/ReadmeTarget.cs
+++ b/build/ReadmeTarget.cs
@@ -249,7 +249,7 @@ private async Task GenerateExamplesAsync(IEnumerable<(string GroupName, Dictiona
                     content = content
                         .Replace("$(version)", generatorPackageVersion)
                         .Replace("$(ms.version)", msPackageVersion)
-                        .Replace("$(targetFrameworkVersion)", "net8.0");
+                        .Replace("$(targetFrameworkVersion)", "net9.0");
                     await File.WriteAllTextAsync(readmeFile.Replace("PageTemplate.md", ".md"), content);
                 }
 
diff --git a/readme/Avalonia.md b/readme/Avalonia.md
index 189f0782..1e3628a7 100644
--- a/readme/Avalonia.md
+++ b/readme/Avalonia.md
@@ -168,7 +168,7 @@ The [project file](/samples/AvaloniaApp/AvaloniaApp.csproj) looks like this:
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <OutputType>WinExe</OutputType>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md
index 51c653db..3f5aace5 100644
--- a/readme/BlazorServerApp.md
+++ b/readme/BlazorServerApp.md
@@ -64,7 +64,7 @@ The [project file](/samples/BlazorServerApp/BlazorServerApp.csproj) looks like t
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md
index 1c4bce32..02ec876e 100644
--- a/readme/BlazorWebAssemblyApp.md
+++ b/readme/BlazorWebAssemblyApp.md
@@ -63,7 +63,7 @@ The [project file](/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj) lo
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/readme/Console.md b/readme/Console.md
index a47c7899..12d6ffa5 100644
--- a/readme/Console.md
+++ b/readme/Console.md
@@ -85,7 +85,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md
index acb9520d..fa4f483b 100644
--- a/readme/ConsoleTopLevelStatements.md
+++ b/readme/ConsoleTopLevelStatements.md
@@ -70,7 +70,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/readme/GrpcService.md b/readme/GrpcService.md
index a059d804..979ff8e4 100644
--- a/readme/GrpcService.md
+++ b/readme/GrpcService.md
@@ -49,7 +49,7 @@ The [project file](/samples/GrpcService/GrpcService.csproj) looks like this:
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/readme/ReadmeTemplate.md b/readme/ReadmeTemplate.md
index 99bebdb7..ec53c6f9 100644
--- a/readme/ReadmeTemplate.md
+++ b/readme/ReadmeTemplate.md
@@ -67,7 +67,7 @@ The above code specifies the generation of a partial class named *__Composition_
 ```c#
 partial class Composition
 {
-    private object _lock = new object();
+    private Lock _lock = new Lock()();
     private Random? _random;
     
     public Program Root
@@ -75,9 +75,9 @@ partial class Composition
       get
       {
         var stateFunc = new Func<State>(() => {
-              if (_random == null)
-                lock (_lock)
-                  if (_random == null)
+              if (_random is null)
+                using (_lockM11D21di.EnterScope())
+                  if (_random is null)
                     _random = new Random();
 
               return (State)_random.Next(2)
diff --git a/readme/WebAPI.md b/readme/WebAPI.md
index 06d2656d..681e9e29 100644
--- a/readme/WebAPI.md
+++ b/readme/WebAPI.md
@@ -47,7 +47,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/readme/WebApp.md b/readme/WebApp.md
index eb820d80..6a9f3acf 100644
--- a/readme/WebApp.md
+++ b/readme/WebApp.md
@@ -47,7 +47,7 @@ The [project file](/samples/WebApp/WebApp.csproj) looks like this:
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/readme/WinFormsAppNetCore.md b/readme/WinFormsAppNetCore.md
index 2f1f2e60..62753a80 100644
--- a/readme/WinFormsAppNetCore.md
+++ b/readme/WinFormsAppNetCore.md
@@ -62,7 +62,7 @@ The [project file](/samples/WinFormsAppNetCore/WinFormsAppNetCore.csproj) looks
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <TargetFramework>net9.0-windows</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/readme/Wpf.md b/readme/Wpf.md
index 5d5c61a0..8293908c 100644
--- a/readme/Wpf.md
+++ b/readme/Wpf.md
@@ -108,7 +108,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this:
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <TargetFramework>net9.0-windows</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/readme/accumulators.md b/readme/accumulators.md
index c85575ab..084612d8 100644
--- a/readme/accumulators.md
+++ b/readme/accumulators.md
@@ -47,7 +47,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private XyzDependency? _singletonXyzDependency41;
 
@@ -55,7 +55,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -73,7 +73,7 @@ partial class Composition
       AbcDependency perBlockAbcDependency4 = new AbcDependency();
       if (_root._singletonXyzDependency41 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonXyzDependency41 is null)
           {
@@ -87,12 +87,12 @@ partial class Composition
       }
 
       AbcDependency transientAbcDependency3 = new AbcDependency();
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator44.Add(transientAbcDependency3);
       }
       Service transientService1 = new Service(transientAbcDependency3, _root._singletonXyzDependency41!, perBlockAbcDependency4);
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator44.Add(transientService1);
       }
diff --git a/readme/async-disposable-scope.md b/readme/async-disposable-scope.md
index 5b6ea87b..8f45ac10 100644
--- a/readme/async-disposable-scope.md
+++ b/readme/async-disposable-scope.md
@@ -89,7 +89,7 @@ The following partial class will be generated:
 partial class Composition: IDisposable, IAsyncDisposable
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
   private object[] _disposables;
   private int _disposeIndex;
 
@@ -99,7 +99,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
     _disposables = new object[1];
   }
 
@@ -117,7 +117,7 @@ partial class Composition: IDisposable, IAsyncDisposable
     {
       if (_scopedDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_scopedDependency39 is null)
           {
@@ -150,7 +150,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    using (_lock.EnterScope())
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
@@ -187,7 +187,8 @@ partial class Composition: IDisposable, IAsyncDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    _lock.Enter();
+    try
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
@@ -195,6 +196,10 @@ partial class Composition: IDisposable, IAsyncDisposable
       _disposables = new object[1];
       _scopedDependency39 = null;
     }
+    finally
+    {
+      _lock.Exit();
+    }
 
     while (disposeIndex-- > 0)
     {
diff --git a/readme/async-disposable-singleton.md b/readme/async-disposable-singleton.md
index 56242eae..b7c751bc 100644
--- a/readme/async-disposable-singleton.md
+++ b/readme/async-disposable-singleton.md
@@ -55,7 +55,7 @@ The following partial class will be generated:
 partial class Composition: IDisposable, IAsyncDisposable
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
   private object[] _disposables;
   private int _disposeIndex;
 
@@ -65,7 +65,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
     _disposables = new object[1];
   }
 
@@ -83,7 +83,7 @@ partial class Composition: IDisposable, IAsyncDisposable
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
@@ -101,7 +101,7 @@ partial class Composition: IDisposable, IAsyncDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    using (_lock.EnterScope())
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
@@ -138,7 +138,8 @@ partial class Composition: IDisposable, IAsyncDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    _lock.Enter();
+    try
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
@@ -146,6 +147,10 @@ partial class Composition: IDisposable, IAsyncDisposable
       _disposables = new object[1];
       _singletonDependency39 = null;
     }
+    finally
+    {
+      _lock.Exit();
+    }
 
     while (disposeIndex-- > 0)
     {
diff --git a/readme/auto-scoped.md b/readme/auto-scoped.md
index 2424dabf..415bf1b3 100644
--- a/readme/auto-scoped.md
+++ b/readme/auto-scoped.md
@@ -73,7 +73,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _scopedDependency39;
 
@@ -81,7 +81,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -118,7 +118,7 @@ partial class Composition
     {
       if (_scopedDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_scopedDependency39 is null)
           {
diff --git a/readme/bind-attribute-for-a-generic-type.md b/readme/bind-attribute-for-a-generic-type.md
index 9697372c..fbbeefad 100644
--- a/readme/bind-attribute-for-a-generic-type.md
+++ b/readme/bind-attribute-for-a-generic-type.md
@@ -50,7 +50,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Facade? _singletonFacade39;
 
@@ -58,7 +58,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -74,7 +74,7 @@ partial class Composition
     {
       if (_root._singletonFacade39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonFacade39 is null)
           {
diff --git a/readme/bind-attribute-with-lifetime-and-tag.md b/readme/bind-attribute-with-lifetime-and-tag.md
index 1b388774..e4dab6b8 100644
--- a/readme/bind-attribute-with-lifetime-and-tag.md
+++ b/readme/bind-attribute-with-lifetime-and-tag.md
@@ -50,7 +50,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private IDependency? _singletonIDependency0;
   private Facade? _singletonFacade39;
@@ -59,7 +59,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -75,7 +75,7 @@ partial class Composition
     {
       if (_root._singletonIDependency0 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonIDependency0 is null)
           {
diff --git a/readme/bind-attribute.md b/readme/bind-attribute.md
index fee0fdde..0ec3333b 100644
--- a/readme/bind-attribute.md
+++ b/readme/bind-attribute.md
@@ -54,7 +54,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Facade? _singletonFacade39;
 
@@ -62,7 +62,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -78,7 +78,7 @@ partial class Composition
     {
       if (_root._singletonFacade39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonFacade39 is null)
           {
diff --git a/readme/custom-attributes.md b/readme/custom-attributes.md
index d931cfd6..7e412bea 100644
--- a/readme/custom-attributes.md
+++ b/readme/custom-attributes.md
@@ -122,17 +122,21 @@ classDiagram
 	}
 	class String
 	class Int32
-	Uri --|> ISpanFormattable
 	Uri --|> IFormattable
+	Uri --|> ISpanFormattable
+	Uri --|> IEquatableᐸUriᐳ
 	Uri --|> ISerializable
 	class Uri
 	class IPerson {
 		<<interface>>
 	}
+	class IFormattable {
+		<<interface>>
+	}
 	class ISpanFormattable {
 		<<interface>>
 	}
-	class IFormattable {
+	class IEquatableᐸUriᐳ {
 		<<interface>>
 	}
 	class ISerializable {
diff --git a/readme/custom-universal-attribute.md b/readme/custom-universal-attribute.md
index d531dc15..744221f0 100644
--- a/readme/custom-universal-attribute.md
+++ b/readme/custom-universal-attribute.md
@@ -99,17 +99,21 @@ classDiagram
 	}
 	class String
 	class Int32
-	Uri --|> ISpanFormattable
 	Uri --|> IFormattable
+	Uri --|> ISpanFormattable
+	Uri --|> IEquatableᐸUriᐳ
 	Uri --|> ISerializable
 	class Uri
 	class IPerson {
 		<<interface>>
 	}
+	class IFormattable {
+		<<interface>>
+	}
 	class ISpanFormattable {
 		<<interface>>
 	}
-	class IFormattable {
+	class IEquatableᐸUriᐳ {
 		<<interface>>
 	}
 	class ISerializable {
diff --git a/readme/default-lifetime-for-a-type-and-a-tag.md b/readme/default-lifetime-for-a-type-and-a-tag.md
index e81f4174..db3c0f25 100644
--- a/readme/default-lifetime-for-a-type-and-a-tag.md
+++ b/readme/default-lifetime-for-a-type-and-a-tag.md
@@ -51,7 +51,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
   private Dependency? _singletonDependency40;
@@ -60,7 +60,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -76,7 +76,7 @@ partial class Composition
     {
       if (_root._singletonDependency40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency40 is null)
           {
@@ -87,7 +87,7 @@ partial class Composition
 
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/default-lifetime-for-a-type.md b/readme/default-lifetime-for-a-type.md
index 69de567d..311592ab 100644
--- a/readme/default-lifetime-for-a-type.md
+++ b/readme/default-lifetime-for-a-type.md
@@ -50,7 +50,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -58,7 +58,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -74,7 +74,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/default-lifetime.md b/readme/default-lifetime.md
index 583f7570..2994eb7f 100644
--- a/readme/default-lifetime.md
+++ b/readme/default-lifetime.md
@@ -52,7 +52,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Service? _singletonService40;
   private Dependency? _singletonDependency39;
@@ -61,7 +61,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -77,7 +77,7 @@ partial class Composition
     {
       if (_root._singletonService40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonService40 is null)
           {
diff --git a/readme/disposable-singleton.md b/readme/disposable-singleton.md
index d21b334e..805ceb08 100644
--- a/readme/disposable-singleton.md
+++ b/readme/disposable-singleton.md
@@ -53,7 +53,7 @@ The following partial class will be generated:
 partial class Composition: IDisposable
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
   private object[] _disposables;
   private int _disposeIndex;
 
@@ -63,7 +63,7 @@ partial class Composition: IDisposable
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
     _disposables = new object[1];
   }
 
@@ -81,7 +81,7 @@ partial class Composition: IDisposable
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
@@ -99,7 +99,7 @@ partial class Composition: IDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    using (_lock.EnterScope())
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
diff --git a/readme/exposed-generic-roots-with-args.md b/readme/exposed-generic-roots-with-args.md
index 0f5fc29a..7161e423 100644
--- a/readme/exposed-generic-roots-with-args.md
+++ b/readme/exposed-generic-roots-with-args.md
@@ -41,7 +41,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Integration.CompositionWithGenericRootsAndArgsInOtherProject? _singletonCompositionWithGenericRootsAndArgsInOtherProject40;
 
@@ -49,7 +49,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -63,7 +63,7 @@ partial class Composition
   {
     if (_root._singletonCompositionWithGenericRootsAndArgsInOtherProject40 is null)
     {
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         if (_root._singletonCompositionWithGenericRootsAndArgsInOtherProject40 is null)
         {
diff --git a/readme/exposed-generic-roots.md b/readme/exposed-generic-roots.md
index 46231a8d..44af691c 100644
--- a/readme/exposed-generic-roots.md
+++ b/readme/exposed-generic-roots.md
@@ -42,7 +42,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Integration.CompositionWithGenericRootsInOtherProject? _singletonCompositionWithGenericRootsInOtherProject39;
 
@@ -50,7 +50,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -66,7 +66,7 @@ partial class Composition
     {
       if (_root._singletonCompositionWithGenericRootsInOtherProject39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonCompositionWithGenericRootsInOtherProject39 is null)
           {
diff --git a/readme/exposed-roots-with-tags.md b/readme/exposed-roots-with-tags.md
index 5347611a..f183b1f4 100644
--- a/readme/exposed-roots-with-tags.md
+++ b/readme/exposed-roots-with-tags.md
@@ -37,7 +37,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Integration.CompositionWithTagsInOtherProject? _singletonCompositionWithTagsInOtherProject39;
 
@@ -45,7 +45,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -61,7 +61,7 @@ partial class Composition
     {
       if (_root._singletonCompositionWithTagsInOtherProject39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonCompositionWithTagsInOtherProject39 is null)
           {
diff --git a/readme/exposed-roots.md b/readme/exposed-roots.md
index f1fbd665..4716edbe 100644
--- a/readme/exposed-roots.md
+++ b/readme/exposed-roots.md
@@ -40,7 +40,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Integration.CompositionInOtherProject? _singletonCompositionInOtherProject39;
 
@@ -48,7 +48,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -64,7 +64,7 @@ partial class Composition
     {
       if (_root._singletonCompositionInOtherProject39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonCompositionInOtherProject39 is null)
           {
diff --git a/readme/func-with-arguments.md b/readme/func-with-arguments.md
index d247a819..b98ed37b 100644
--- a/readme/func-with-arguments.md
+++ b/readme/func-with-arguments.md
@@ -88,7 +88,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Clock? _singletonClock39;
 
@@ -96,7 +96,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -121,7 +121,7 @@ partial class Composition
         int transientInt323 = dependencyId;
         if (_root._singletonClock39 is null)
         {
-          lock (_lock)
+          using (_lock.EnterScope())
           {
             if (_root._singletonClock39 is null)
             {
diff --git a/readme/keyed-service-provider.md b/readme/keyed-service-provider.md
index ea005caf..09529331 100644
--- a/readme/keyed-service-provider.md
+++ b/readme/keyed-service-provider.md
@@ -51,7 +51,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -59,7 +59,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -75,7 +75,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
@@ -95,7 +95,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/onnewinstance-hint.md b/readme/onnewinstance-hint.md
index 076dc0fa..a21ca617 100644
--- a/readme/onnewinstance-hint.md
+++ b/readme/onnewinstance-hint.md
@@ -65,7 +65,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -73,7 +73,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -89,7 +89,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/perblock.md b/readme/perblock.md
index 3bdf62b7..0166bddf 100644
--- a/readme/perblock.md
+++ b/readme/perblock.md
@@ -50,7 +50,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private (IDependency dep3, IDependency dep4) _singletonValueTuple40;
   private bool _singletonValueTuple40Created;
@@ -59,7 +59,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -75,7 +75,7 @@ partial class Composition
     {
       if (!_root._singletonValueTuple40Created)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (!_root._singletonValueTuple40Created)
           {
diff --git a/readme/perresolve.md b/readme/perresolve.md
index cd2ca24d..2b269500 100644
--- a/readme/perresolve.md
+++ b/readme/perresolve.md
@@ -50,7 +50,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private (IDependency dep3, IDependency dep4) _singletonValueTuple40;
   private bool _singletonValueTuple40Created;
@@ -59,7 +59,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -76,7 +76,7 @@ partial class Composition
       var perResolveDependency39 = default(Dependency);
       if (!_root._singletonValueTuple40Created)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (!_root._singletonValueTuple40Created)
           {
@@ -94,7 +94,7 @@ partial class Composition
 
       if (perResolveDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (perResolveDependency39 is null)
           {
diff --git a/readme/root-binding.md b/readme/root-binding.md
index 5fb532fb..c5403c4f 100644
--- a/readme/root-binding.md
+++ b/readme/root-binding.md
@@ -31,7 +31,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -39,7 +39,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -55,7 +55,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/scope.md b/readme/scope.md
index 3f770fb5..7e8f99bb 100644
--- a/readme/scope.md
+++ b/readme/scope.md
@@ -87,7 +87,7 @@ The following partial class will be generated:
 partial class Composition: IDisposable
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
   private object[] _disposables;
   private int _disposeIndex;
 
@@ -97,7 +97,7 @@ partial class Composition: IDisposable
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
     _disposables = new object[1];
   }
 
@@ -115,7 +115,7 @@ partial class Composition: IDisposable
     {
       if (_scopedDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_scopedDependency39 is null)
           {
@@ -148,7 +148,7 @@ partial class Composition: IDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    using (_lock.EnterScope())
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
diff --git a/readme/service-collection.md b/readme/service-collection.md
index e38c6d30..b7adac0a 100644
--- a/readme/service-collection.md
+++ b/readme/service-collection.md
@@ -48,7 +48,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -56,7 +56,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -72,7 +72,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
@@ -92,7 +92,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/service-provider-with-scope.md b/readme/service-provider-with-scope.md
index c7948c8b..b1cfe1f7 100644
--- a/readme/service-provider-with-scope.md
+++ b/readme/service-provider-with-scope.md
@@ -77,7 +77,7 @@ The following partial class will be generated:
 partial class Composition: IDisposable
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
   private object[] _disposables;
   private int _disposeIndex;
 
@@ -88,7 +88,7 @@ partial class Composition: IDisposable
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
     _disposables = new object[1];
   }
 
@@ -106,7 +106,7 @@ partial class Composition: IDisposable
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
@@ -126,7 +126,7 @@ partial class Composition: IDisposable
     {
       if (_scopedService40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_scopedService40 is null)
           {
@@ -209,7 +209,7 @@ partial class Composition: IDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    using (_lock.EnterScope())
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
diff --git a/readme/service-provider.md b/readme/service-provider.md
index 54aac957..a0cd14fd 100644
--- a/readme/service-provider.md
+++ b/readme/service-provider.md
@@ -46,7 +46,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -54,7 +54,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -70,7 +70,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
@@ -90,7 +90,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/singleton.md b/readme/singleton.md
index c5744107..5d512447 100644
--- a/readme/singleton.md
+++ b/readme/singleton.md
@@ -61,7 +61,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private Dependency? _singletonDependency39;
 
@@ -69,7 +69,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -85,7 +85,7 @@ partial class Composition
     {
       if (_root._singletonDependency39 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonDependency39 is null)
           {
diff --git a/readme/tag-type.md b/readme/tag-type.md
index 97efe6d4..bfaaffe0 100644
--- a/readme/tag-type.md
+++ b/readme/tag-type.md
@@ -61,7 +61,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private XyzDependency? _singletonXyzDependency40;
 
@@ -69,7 +69,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -85,7 +85,7 @@ partial class Composition
     {
       if (_root._singletonXyzDependency40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonXyzDependency40 is null)
           {
@@ -105,7 +105,7 @@ partial class Composition
     {
       if (_root._singletonXyzDependency40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonXyzDependency40 is null)
           {
diff --git a/readme/tags.md b/readme/tags.md
index f496c2fa..f7b5bb2a 100644
--- a/readme/tags.md
+++ b/readme/tags.md
@@ -65,7 +65,7 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   private XyzDependency? _singletonXyzDependency40;
 
@@ -73,7 +73,7 @@ partial class Composition
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -89,7 +89,7 @@ partial class Composition
     {
       if (_root._singletonXyzDependency40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonXyzDependency40 is null)
           {
@@ -109,7 +109,7 @@ partial class Composition
     {
       if (_root._singletonXyzDependency40 is null)
       {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           if (_root._singletonXyzDependency40 is null)
           {
diff --git a/readme/tracking-async-disposable-instances-in-delegates.md b/readme/tracking-async-disposable-instances-in-delegates.md
index 4caa1581..15238a54 100644
--- a/readme/tracking-async-disposable-instances-in-delegates.md
+++ b/readme/tracking-async-disposable-instances-in-delegates.md
@@ -76,13 +76,13 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   [OrdinalAttribute(20)]
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -101,7 +101,7 @@ partial class Composition
       {
         var accumulator43 = new Owned();
         Dependency transientDependency4 = new Dependency();
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator43.Add(transientDependency4);
         }
@@ -110,7 +110,7 @@ partial class Composition
         Owned localOwned8 = accumulator43;
         IDependency localValue9 = transientDependency4;
         perBlockOwned2 = new Owned<IDependency>(localValue9, localOwned8);
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator43.Add(perBlockOwned2);
         }
@@ -118,7 +118,7 @@ partial class Composition
         return localValue7;
       });
       Service transientService0 = new Service(perBlockFunc1);
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator43.Add(transientService0);
       }
diff --git a/readme/tracking-async-disposable-instances-per-a-composition-root.md b/readme/tracking-async-disposable-instances-per-a-composition-root.md
index 430bc0a7..76b95de4 100644
--- a/readme/tracking-async-disposable-instances-per-a-composition-root.md
+++ b/readme/tracking-async-disposable-instances-per-a-composition-root.md
@@ -69,13 +69,13 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   [OrdinalAttribute(20)]
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -91,7 +91,7 @@ partial class Composition
     {
       var accumulator42 = new Owned();
       Dependency transientDependency3 = new Dependency();
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator42.Add(transientDependency3);
       }
@@ -100,7 +100,7 @@ partial class Composition
       Owned localOwned10 = accumulator42;
       IService localValue11 = new Service(transientDependency3);
       perBlockOwned0 = new Owned<IService>(localValue11, localOwned10);
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator42.Add(perBlockOwned0);
       }
diff --git a/readme/tracking-disposable-instances-in-delegates.md b/readme/tracking-disposable-instances-in-delegates.md
index d56f2b2f..1847c0ab 100644
--- a/readme/tracking-disposable-instances-in-delegates.md
+++ b/readme/tracking-disposable-instances-in-delegates.md
@@ -69,13 +69,13 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   [OrdinalAttribute(20)]
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -94,7 +94,7 @@ partial class Composition
       {
         var accumulator43 = new Owned();
         Dependency transientDependency4 = new Dependency();
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator43.Add(transientDependency4);
         }
@@ -103,7 +103,7 @@ partial class Composition
         Owned localOwned13 = accumulator43;
         IDependency localValue14 = transientDependency4;
         perBlockOwned2 = new Owned<IDependency>(localValue14, localOwned13);
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator43.Add(perBlockOwned2);
         }
@@ -111,7 +111,7 @@ partial class Composition
         return localValue12;
       });
       Service transientService0 = new Service(perBlockFunc1);
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator43.Add(transientService0);
       }
diff --git a/readme/tracking-disposable-instances-per-a-composition-root.md b/readme/tracking-disposable-instances-per-a-composition-root.md
index ecc7526e..781f5979 100644
--- a/readme/tracking-disposable-instances-per-a-composition-root.md
+++ b/readme/tracking-disposable-instances-per-a-composition-root.md
@@ -65,13 +65,13 @@ The following partial class will be generated:
 partial class Composition
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
 
   [OrdinalAttribute(20)]
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
   }
 
   internal Composition(Composition parentScope)
@@ -87,7 +87,7 @@ partial class Composition
     {
       var accumulator42 = new Owned();
       Dependency transientDependency3 = new Dependency();
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator42.Add(transientDependency3);
       }
@@ -96,7 +96,7 @@ partial class Composition
       Owned localOwned15 = accumulator42;
       IService localValue16 = new Service(transientDependency3);
       perBlockOwned0 = new Owned<IService>(localValue16, localOwned15);
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator42.Add(perBlockOwned0);
       }
diff --git a/readme/tracking-disposable-instances-with-different-lifetimes.md b/readme/tracking-disposable-instances-with-different-lifetimes.md
index f6e6cc57..579c6401 100644
--- a/readme/tracking-disposable-instances-with-different-lifetimes.md
+++ b/readme/tracking-disposable-instances-with-different-lifetimes.md
@@ -93,7 +93,7 @@ The following partial class will be generated:
 partial class Composition: IDisposable
 {
   private readonly Composition _root;
-  private readonly object _lock;
+  private readonly Lock _lock;
   private object[] _disposables;
   private int _disposeIndex;
 
@@ -103,7 +103,7 @@ partial class Composition: IDisposable
   public Composition()
   {
     _root = this;
-    _lock = new object();
+    _lock = new Lock();
     _disposables = new object[1];
   }
 
@@ -125,7 +125,7 @@ partial class Composition: IDisposable
         var accumulator46 = new Owned();
         if (_root._singletonDependency40 is null)
         {
-          lock (_lock)
+          using (_lock.EnterScope())
           {
             if (_root._singletonDependency40 is null)
             {
@@ -140,7 +140,7 @@ partial class Composition: IDisposable
         Owned localOwned18 = accumulator46;
         IDependency localValue19 = _root._singletonDependency40!;
         perBlockOwned3 = new Owned<IDependency>(localValue19, localOwned18);
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator46.Add(perBlockOwned3);
         }
@@ -151,7 +151,7 @@ partial class Composition: IDisposable
       {
         var accumulator46 = new Owned();
         Dependency transientDependency7 = new Dependency();
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator46.Add(transientDependency7);
         }
@@ -160,7 +160,7 @@ partial class Composition: IDisposable
         Owned localOwned21 = accumulator46;
         IDependency localValue22 = transientDependency7;
         perBlockOwned5 = new Owned<IDependency>(localValue22, localOwned21);
-        lock (_lock)
+        using (_lock.EnterScope())
         {
           accumulator46.Add(perBlockOwned5);
         }
@@ -168,7 +168,7 @@ partial class Composition: IDisposable
         return localValue20;
       });
       Service transientService0 = new Service(perBlockFunc1, perBlockFunc2);
-      lock (_lock)
+      using (_lock.EnterScope())
       {
         accumulator46.Add(transientService0);
       }
@@ -240,7 +240,7 @@ partial class Composition: IDisposable
   {
     int disposeIndex;
     object[] disposables;
-    lock (_lock)
+    using (_lock.EnterScope())
     {
       disposeIndex = _disposeIndex;
       _disposeIndex = 0;
diff --git a/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj b/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
index d0319879..5ac65afc 100644
--- a/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
+++ b/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
@@ -10,7 +10,7 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
     </ItemGroup>
 
diff --git a/samples/Clock.Tests/Clock.Tests.csproj b/samples/Clock.Tests/Clock.Tests.csproj
index 8a4c288b..5a622a85 100644
--- a/samples/Clock.Tests/Clock.Tests.csproj
+++ b/samples/Clock.Tests/Clock.Tests.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
         <PackageReference Include="xunit" Version="2.9.2" />
diff --git a/samples/GrpcService/GrpcService.csproj b/samples/GrpcService/GrpcService.csproj
index ea66f5fa..985873c4 100644
--- a/samples/GrpcService/GrpcService.csproj
+++ b/samples/GrpcService/GrpcService.csproj
@@ -9,7 +9,7 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
         <Protobuf Include="Protos\greet.proto" GrpcServices="Server"/>
-        <PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
+        <PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/MinimalWebAPI/MinimalWebAPI.csproj b/samples/MinimalWebAPI/MinimalWebAPI.csproj
index 1f485852..b4aebfff 100644
--- a/samples/MinimalWebAPI/MinimalWebAPI.csproj
+++ b/samples/MinimalWebAPI/MinimalWebAPI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(BaseTargetFramework)</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/samples/WeatherForecast/WeatherForecast.csproj b/samples/WeatherForecast/WeatherForecast.csproj
index a776568a..b817357a 100644
--- a/samples/WeatherForecast/WeatherForecast.csproj
+++ b/samples/WeatherForecast/WeatherForecast.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/WebAPI/WebAPI.csproj b/samples/WebAPI/WebAPI.csproj
index 6735e9b2..d5271512 100644
--- a/samples/WebAPI/WebAPI.csproj
+++ b/samples/WebAPI/WebAPI.csproj
@@ -9,7 +9,7 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
     </ItemGroup>
 
diff --git a/src/Pure.DI.Core/Core/AsyncDisposableSettings.cs b/src/Pure.DI.Core/Core/AsyncDisposableSettings.cs
deleted file mode 100644
index 870ce311..00000000
--- a/src/Pure.DI.Core/Core/AsyncDisposableSettings.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// ReSharper disable ClassNeverInstantiated.Global
-
-namespace Pure.DI.Core;
-
-internal class AsyncDisposableSettings(ICache<Compilation, INamedTypeSymbol?> asyncDisposableTypes)
-    : IAsyncDisposableSettings
-{
-    public INamedTypeSymbol? TryGetAsyncDisposableType(Compilation compilation) =>
-        asyncDisposableTypes.Get(
-            compilation,
-            i => i.GetTypeByMetadataName(Names.IAsyncDisposableInterfaceShortName));
-}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/BindingBuilder.cs b/src/Pure.DI.Core/Core/BindingBuilder.cs
index f8e1041c..b8bda8e8 100644
--- a/src/Pure.DI.Core/Core/BindingBuilder.cs
+++ b/src/Pure.DI.Core/Core/BindingBuilder.cs
@@ -82,7 +82,7 @@ public MdBinding Build(MdSetup setup)
                     if (implementationType is not null && contractsSource is not null)
                     {
                         var baseSymbols = Enumerable.Empty<ITypeSymbol>();
-                        if (implementationType is { SpecialType: SpecialType.None, TypeKind: TypeKind.Class, IsAbstract: false })
+                        if (implementationType is { SpecialType: Microsoft.CodeAnalysis.SpecialType.None, TypeKind: TypeKind.Class, IsAbstract: false })
                         {
                             baseSymbols = baseSymbolsProvider
                                 .GetBaseSymbols(implementationType, (i, deepness) => deepness switch
@@ -92,7 +92,7 @@ 1 when
                                         implementationType.TypeKind != TypeKind.Interface
                                         && !implementationType.IsAbstract
                                         && (i.TypeKind == TypeKind.Interface || i.IsAbstract)
-                                        && i.SpecialType == SpecialType.None
+                                        && i.SpecialType == Microsoft.CodeAnalysis.SpecialType.None
                                         => true,
                                     _ => false
                                 }, 1);
diff --git a/src/Pure.DI.Core/Core/Code/ApiMembersBuilder.cs b/src/Pure.DI.Core/Core/Code/ApiMembersBuilder.cs
index f5a668d0..d9b831eb 100644
--- a/src/Pure.DI.Core/Core/Code/ApiMembersBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/ApiMembersBuilder.cs
@@ -14,7 +14,7 @@ public CompositionCode Build(CompositionCode composition)
         var hints = composition.Source.Source.Hints;
         var isCommentsEnabled = hints.IsCommentsEnabled;
         var apiCode = new LinesBuilder();
-        var nullable = composition.Source.Source.SemanticModel.Compilation.Options.NullableContextOptions == NullableContextOptions.Disable ? "" : "?";
+        var nullable = composition.Compilation.Options.NullableContextOptions == NullableContextOptions.Disable ? "" : "?";
         if (hints.IsResolveEnabled)
         {
             if (isCommentsEnabled)
diff --git a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
index 1bc8b42a..1253e5b1 100644
--- a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
@@ -4,13 +4,15 @@ namespace Pure.DI.Core.Code;
 
 internal class BlockCodeBuilder(
     INodeInfo nodeInfo,
-    ICompilations compilations)
+    ICompilations compilations,
+    ILocks locks)
     : ICodeBuilder<Block>
 {
     public void Build(BuildContext ctx, in Block block)
     {
         var variable = ctx.Variable;
-        var languageVersion = compilations.GetLanguageVersion(variable.Node.Binding.SemanticModel.Compilation);
+        var compilation = variable.Node.Binding.SemanticModel.Compilation;
+        var languageVersion = compilations.GetLanguageVersion(compilation);
         if (!IsNewInstanceRequired(variable))
         {
             return;
@@ -48,14 +50,14 @@ public void Build(BuildContext ctx, in Block block)
                     ? $"!{variable.VariableName}Created"
                     : languageVersion >= LanguageVersion.CSharp9
                         ? $"{variable.VariableName} is null"
-                        : $"{Names.SystemNamespace}Object.ReferenceEquals({variable.VariableName}, null)";
+                        : $"{Names.ObjectTypeName}.ReferenceEquals({variable.VariableName}, null)";
 
                 if (lockIsRequired)
                 {
                     code.AppendLine($"if ({checkExpression})");
                     code.AppendLine("{");
                     code.IncIndent();
-                    code.AppendLine($"lock ({Names.LockFieldName})");
+                    locks.AddLockStatements(compilation, code, false);
                     code.AppendLine("{");
                     code.IncIndent();
                     ctx = ctx with { LockIsRequired = false };
@@ -122,6 +124,7 @@ public void Build(BuildContext ctx, in Block block)
             code.AppendLine("}");
             if (!lockIsRequired)
             {
+                locks.AddUnlockStatements(compilation, code, false);
                 code.AppendLine();
                 return;
             }
diff --git a/src/Pure.DI.Core/Core/Code/BuildTools.cs b/src/Pure.DI.Core/Core/Code/BuildTools.cs
index 351d7342..c9577bcd 100644
--- a/src/Pure.DI.Core/Core/Code/BuildTools.cs
+++ b/src/Pure.DI.Core/Core/Code/BuildTools.cs
@@ -7,7 +7,8 @@ internal class BuildTools(
     IFilter filter,
     ITypeResolver typeResolver,
     IBaseSymbolsProvider baseSymbolsProvider,
-    [Tag("Injection")] IIdGenerator idGenerator)
+    [Tag("Injection")] IIdGenerator idGenerator,
+    ILocks locks)
     : IBuildTools
 {
     public void AddPureHeader(LinesBuilder code)
@@ -102,9 +103,10 @@ public IEnumerable<Line> OnCreated(BuildContext ctx, Variable variable)
             .Select(i => new Line(0, $"{i.Name}.Add({variable.VariableName});"))
             .ToList();
 
+        var compilation = variable.Node.Binding.SemanticModel.Compilation;
         if (lockIsRequired && accLines.Count > 0)
         {
-            code.AppendLine($"lock ({Names.LockFieldName})");
+            locks.AddLockStatements(compilation, code, false);
             code.AppendLine("{");
             code.IncIndent();
         }
@@ -115,6 +117,7 @@ public IEnumerable<Line> OnCreated(BuildContext ctx, Variable variable)
         {
             code.DecIndent();
             code.AppendLine("}");
+            locks.AddUnlockStatements(compilation, code, false);
         }
 
         if (!ctx.DependencyGraph.Source.Hints.IsOnNewInstanceEnabled)
diff --git a/src/Pure.DI.Core/Core/Code/ClassBuilder.cs b/src/Pure.DI.Core/Core/Code/ClassBuilder.cs
index ede99e21..ed3ea487 100644
--- a/src/Pure.DI.Core/Core/Code/ClassBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/ClassBuilder.cs
@@ -46,7 +46,7 @@ public CompositionCode Build(CompositionCode composition)
         var code = composition.Code;
         code.AppendLine("// <auto-generated/>");
         code.AppendLine($"// by {information.Description}");
-        if (composition.Source.Source.SemanticModel.Compilation.Options.NullableContextOptions != NullableContextOptions.Disable)
+        if (composition.Compilation.Options.NullableContextOptions != NullableContextOptions.Disable)
         {
             code.AppendLine("#nullable enable");
         }
diff --git a/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs b/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs
index 6a676765..7ea14cc7 100644
--- a/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs
@@ -16,7 +16,7 @@ internal sealed class ClassDiagramBuilder(
     public LinesBuilder Build(CompositionCode composition)
     {
         var setup = composition.Source.Source;
-        var nullable = composition.Source.Source.SemanticModel.Compilation.Options.NullableContextOptions == NullableContextOptions.Disable ? "" : "?";
+        var nullable = composition.Compilation.Options.NullableContextOptions == NullableContextOptions.Disable ? "" : "?";
         var lines = new LinesBuilder();
         lines.AppendLine("classDiagram");
         using (lines.Indent())
diff --git a/src/Pure.DI.Core/Core/Code/DefaultConstructorBuilder.cs b/src/Pure.DI.Core/Core/Code/DefaultConstructorBuilder.cs
index b1a4f446..4b08e4e0 100644
--- a/src/Pure.DI.Core/Core/Code/DefaultConstructorBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/DefaultConstructorBuilder.cs
@@ -2,7 +2,9 @@
 
 namespace Pure.DI.Core.Code;
 
-internal sealed class DefaultConstructorBuilder : IBuilder<CompositionCode, CompositionCode>
+internal sealed class DefaultConstructorBuilder(
+    ILocks locks)
+    : IBuilder<CompositionCode, CompositionCode>
 {
     public CompositionCode Build(CompositionCode composition)
     {
@@ -30,7 +32,7 @@ public CompositionCode Build(CompositionCode composition)
             code.AppendLine($"{Names.RootFieldName} = this;");
             if (composition.IsThreadSafe)
             {
-                code.AppendLine($"{Names.LockFieldName} = new object();");
+                code.AppendLine($"{Names.LockFieldName} = new {locks.GetLockType(composition.Compilation)}();");
             }
 
             if (composition.TotalDisposablesCount > 0)
diff --git a/src/Pure.DI.Core/Core/Code/DisposeMethodBuilder.cs b/src/Pure.DI.Core/Core/Code/DisposeMethodBuilder.cs
index e9b47d10..d69537a9 100644
--- a/src/Pure.DI.Core/Core/Code/DisposeMethodBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/DisposeMethodBuilder.cs
@@ -2,7 +2,8 @@
 
 namespace Pure.DI.Core.Code;
 
-internal sealed class DisposeMethodBuilder
+internal sealed class DisposeMethodBuilder(
+    ILocks locks)
     : IBuilder<CompositionCode, CompositionCode>
 {
     public CompositionCode Build(CompositionCode composition)
@@ -29,7 +30,7 @@ public CompositionCode Build(CompositionCode composition)
         code.AppendLine("{");
         using (code.Indent())
         {
-            AddSyncPart(composition, code);
+            AddSyncPart(composition, code, false);
             code.AppendLine();
             code.AppendLine("while (disposeIndex-- > 0)");
             code.AppendLine("{");
@@ -85,11 +86,11 @@ public CompositionCode Build(CompositionCode composition)
                 code.AppendLine("/// </summary>");
             }
 
-            code.AppendLine($"{composition.Source.Source.Hints.DisposeAsyncMethodModifiers} async {Names.ValueTaskName} DisposeAsync()");
+            code.AppendLine($"{composition.Source.Source.Hints.DisposeAsyncMethodModifiers} async {Names.ValueTaskTypeName} DisposeAsync()");
             code.AppendLine("{");
             using (code.Indent())
             {
-                AddSyncPart(composition, code);
+                AddSyncPart(composition, code, true);
                 code.AppendLine();
                 code.AppendLine("while (disposeIndex-- > 0)");
                 code.AppendLine("{");
@@ -203,11 +204,11 @@ private static void AddDisposePart(LinesBuilder code)
         }
     }
 
-    private static void AddSyncPart(CompositionCode composition, LinesBuilder code)
+    private void AddSyncPart(CompositionCode composition, LinesBuilder code, bool isAsync)
     {
         code.AppendLine("int disposeIndex;");
         code.AppendLine("object[] disposables;");
-        code.AppendLine($"lock ({Names.LockFieldName})");
+        locks.AddLockStatements(composition.Compilation, code, isAsync);
         code.AppendLine("{");
         using (code.Indent())
         {
@@ -225,5 +226,6 @@ private static void AddSyncPart(CompositionCode composition, LinesBuilder code)
         }
 
         code.AppendLine("}");
+        locks.AddUnlockStatements(composition.Compilation, code, isAsync);
     }
 }
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/FieldsBuilder.cs b/src/Pure.DI.Core/Core/Code/FieldsBuilder.cs
index b91858c2..9015cb48 100644
--- a/src/Pure.DI.Core/Core/Code/FieldsBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/FieldsBuilder.cs
@@ -3,14 +3,17 @@
 
 namespace Pure.DI.Core.Code;
 
-internal sealed class FieldsBuilder(ITypeResolver typeResolver)
+internal sealed class FieldsBuilder(
+    ITypeResolver typeResolver,
+    ILocks locks)
     : IBuilder<CompositionCode, CompositionCode>
 {
     public CompositionCode Build(CompositionCode composition)
     {
         var code = composition.Code;
         var membersCounter = composition.MembersCount;
-        var nullable = composition.Source.Source.SemanticModel.Compilation.Options.NullableContextOptions == NullableContextOptions.Disable ? "" : "?";
+        var compilation = composition.Compilation;
+        var nullable = compilation.Options.NullableContextOptions == NullableContextOptions.Disable ? "" : "?";
 
         // _parent filed
         code.AppendLine($"private readonly {composition.Source.Source.Name.ClassName} {Names.RootFieldName};");
@@ -19,7 +22,7 @@ public CompositionCode Build(CompositionCode composition)
         if (composition.IsThreadSafe)
         {
             // _lock field
-            code.AppendLine($"private readonly object {Names.LockFieldName};");
+            code.AppendLine($"private readonly {locks.GetLockType(compilation)} {Names.LockFieldName};");
             membersCounter++;
         }
 
diff --git a/src/Pure.DI.Core/Core/Code/ILocks.cs b/src/Pure.DI.Core/Core/Code/ILocks.cs
new file mode 100644
index 00000000..33f1c529
--- /dev/null
+++ b/src/Pure.DI.Core/Core/Code/ILocks.cs
@@ -0,0 +1,10 @@
+namespace Pure.DI.Core.Code;
+
+internal interface ILocks
+{
+    string GetLockType(Compilation compilation);
+
+    void AddLockStatements(Compilation compilation, LinesBuilder lines, bool isAsync);
+    
+    void AddUnlockStatements(Compilation compilation, LinesBuilder lines, bool isAsync);
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/Locks.cs b/src/Pure.DI.Core/Core/Code/Locks.cs
new file mode 100644
index 00000000..f0225399
--- /dev/null
+++ b/src/Pure.DI.Core/Core/Code/Locks.cs
@@ -0,0 +1,42 @@
+namespace Pure.DI.Core.Code;
+
+internal class Locks(ITypes types) : ILocks
+{
+    public string GetLockType(Compilation compilation) =>
+        types.TryGet(SpecialType.Lock, compilation) is not null
+            ? Names.LockTypeName
+            : Names.ObjectTypeName;
+
+    public void AddLockStatements(Compilation compilation, LinesBuilder lines, bool isAsync)
+    {
+        if (!isAsync)
+        {
+            lines.AppendLine(
+                types.TryGet(SpecialType.Lock, compilation) is not null
+                    ? $"using ({Names.LockFieldName}.EnterScope())"
+                    : $"lock ({Names.LockFieldName})");
+        }
+        else
+        {
+            lines.AppendLine($"{Names.LockFieldName}.Enter();");
+            lines.AppendLine($"try");
+        }
+    }
+
+    public void AddUnlockStatements(Compilation compilation, LinesBuilder lines, bool isAsync)
+    {
+        if (!isAsync)
+        {
+            return;
+        }
+
+        lines.AppendLine("finally");
+        lines.AppendLine("{");
+        using (lines.Indent())
+        {
+            lines.AppendLine($"{Names.LockFieldName}.Exit();");
+        }
+
+        lines.AppendLine("}");
+    }
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/NodeInfo.cs b/src/Pure.DI.Core/Core/Code/NodeInfo.cs
index 00d905d4..f69c9239 100644
--- a/src/Pure.DI.Core/Core/Code/NodeInfo.cs
+++ b/src/Pure.DI.Core/Core/Code/NodeInfo.cs
@@ -2,7 +2,9 @@
 
 namespace Pure.DI.Core.Code;
 
-internal class NodeInfo(IAsyncDisposableSettings asyncDisposableSettings) : INodeInfo
+using SpecialType = Microsoft.CodeAnalysis.SpecialType;
+
+internal class NodeInfo(ITypes types) : INodeInfo
 {
     public bool IsDelegate(DependencyNode node) =>
         node.Type.TypeKind == TypeKind.Delegate;
@@ -25,6 +27,6 @@ private static bool IsAsyncEnumerable(DependencyNode node) =>
         node.Construct is { Source.Kind: MdConstructKind.AsyncEnumerable };
 
     private bool IsAsyncDisposable(Compilation compilation, ISymbol type) =>
-        asyncDisposableSettings.TryGetAsyncDisposableType(compilation) is { } asyncDisposableType
+        types.TryGet(Core.SpecialType.IAsyncDisposable, compilation) is { } asyncDisposableType
         && SymbolEqualityComparer.Default.Equals(type, asyncDisposableType);
 }
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Code/ParameterizedConstructorBuilder.cs b/src/Pure.DI.Core/Core/Code/ParameterizedConstructorBuilder.cs
index 7cb293b1..91c757ee 100644
--- a/src/Pure.DI.Core/Core/Code/ParameterizedConstructorBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/ParameterizedConstructorBuilder.cs
@@ -5,7 +5,8 @@ namespace Pure.DI.Core.Code;
 internal sealed class ParameterizedConstructorBuilder(
     ITypeResolver typeResolver,
     [Tag(typeof(ParameterizedConstructorCommenter))]
-    ICommenter<Unit> constructorCommenter)
+    ICommenter<Unit> constructorCommenter,
+    ILocks locks)
     : IBuilder<CompositionCode, CompositionCode>
 {
     public CompositionCode Build(CompositionCode composition)
@@ -44,7 +45,7 @@ public CompositionCode Build(CompositionCode composition)
             code.AppendLine($"{Names.RootFieldName} = this;");
             if (composition.IsThreadSafe)
             {
-                code.AppendLine($"{Names.LockFieldName} = new object();");
+                code.AppendLine($"{Names.LockFieldName} = new {locks.GetLockType(composition.Compilation)}();");
             }
 
             if (composition.TotalDisposablesCount > 0)
diff --git a/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs b/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs
index 99575deb..09071a14 100644
--- a/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs
+++ b/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs
@@ -288,7 +288,7 @@ public IEnumerable<DependencyNode> TryBuild(
                 }
 
                 // Auto-binding
-                if (injection.Type is { IsAbstract: false, SpecialType: SpecialType.None })
+                if (injection.Type is { IsAbstract: false, SpecialType: Microsoft.CodeAnalysis.SpecialType.None })
                 {
                     var autoBinding = CreateAutoBinding(setup, targetNode, injection, ++maxId);
                     return CreateNodes(setup, autoBinding).ToArray();
diff --git a/src/Pure.DI.Core/Core/IAsyncDisposableSettings.cs b/src/Pure.DI.Core/Core/IAsyncDisposableSettings.cs
deleted file mode 100644
index 532db05b..00000000
--- a/src/Pure.DI.Core/Core/IAsyncDisposableSettings.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Pure.DI.Core;
-
-internal interface IAsyncDisposableSettings
-{
-    INamedTypeSymbol? TryGetAsyncDisposableType(Compilation compilation);
-}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/ITypes.cs b/src/Pure.DI.Core/Core/ITypes.cs
new file mode 100644
index 00000000..61c21de7
--- /dev/null
+++ b/src/Pure.DI.Core/Core/ITypes.cs
@@ -0,0 +1,6 @@
+namespace Pure.DI.Core;
+
+internal interface ITypes
+{
+    INamedTypeSymbol? TryGet(SpecialType specialType, Compilation compilation);
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Models/CompositionCode.cs b/src/Pure.DI.Core/Core/Models/CompositionCode.cs
index b22ced52..d5ea22fd 100644
--- a/src/Pure.DI.Core/Core/Models/CompositionCode.cs
+++ b/src/Pure.DI.Core/Core/Models/CompositionCode.cs
@@ -11,4 +11,9 @@ internal record CompositionCode(
     int DisposablesScopedCount,
     bool IsThreadSafe,
     in ImmutableArray<Line> Diagram,
-    int MembersCount = 0);
\ No newline at end of file
+    int MembersCount = 0)
+{
+    public SemanticModel SemanticModel => Source.Source.SemanticModel;
+    
+    public Compilation Compilation => SemanticModel.Compilation;
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Names.cs b/src/Pure.DI.Core/Core/Names.cs
index 655269d0..289fff05 100644
--- a/src/Pure.DI.Core/Core/Names.cs
+++ b/src/Pure.DI.Core/Core/Names.cs
@@ -36,7 +36,6 @@ internal static class Names
     public const string ResolverPropertyName = "Value";
     public const string IDisposableInterfaceName = $"{SystemNamespace}{nameof(IDisposable)}";
     public const string IAsyncDisposableInterfaceName = $"{SystemNamespace}IAsyncDisposable";
-    public const string IAsyncDisposableInterfaceShortName = $"{nameof(System)}.IAsyncDisposable";
     public const string ResolverInterfaceName = $"{ApiNamespace}{nameof(IResolver<object, object>)}";
     public const string ContextInterfaceName = $"{ApiNamespace}{nameof(IContext)}";
     public const string ConfigurationInterfaceName = $"{ApiNamespace}{nameof(IConfiguration)}";
@@ -45,8 +44,10 @@ internal static class Names
     public const string OrdinalAttributeName = $"{ApiNamespace}{nameof(OrdinalAttribute)}";
     public const string BindAttributeName = $"{ApiNamespace}{nameof(BindAttribute)}";
 
-    // Classes
-    public const string ValueTaskName = $"{SystemNamespace}Threading.Tasks.ValueTask";
+    // Types
+    public const string ObjectTypeName = $"{SystemNamespace}Object";
+    public const string ValueTaskTypeName = $"{SystemNamespace}Threading.Tasks.ValueTask";
+    public const string LockTypeName = $"{SystemNamespace}Threading.Lock";
 
     // Members
     public const string ResolveMethodName = nameof(IResolver<object, object>.Resolve);
diff --git a/src/Pure.DI.Core/Core/SpecialType.cs b/src/Pure.DI.Core/Core/SpecialType.cs
new file mode 100644
index 00000000..314e001c
--- /dev/null
+++ b/src/Pure.DI.Core/Core/SpecialType.cs
@@ -0,0 +1,8 @@
+namespace Pure.DI.Core;
+
+internal enum SpecialType
+{
+    IAsyncDisposable,
+    
+    Lock
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/SpecialTypeKey.cs b/src/Pure.DI.Core/Core/SpecialTypeKey.cs
new file mode 100644
index 00000000..4a89a085
--- /dev/null
+++ b/src/Pure.DI.Core/Core/SpecialTypeKey.cs
@@ -0,0 +1,3 @@
+namespace Pure.DI.Core;
+
+internal record SpecialTypeKey(SpecialType SpecialType, Compilation Compilation);
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/Types.cs b/src/Pure.DI.Core/Core/Types.cs
new file mode 100644
index 00000000..525bad5e
--- /dev/null
+++ b/src/Pure.DI.Core/Core/Types.cs
@@ -0,0 +1,19 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+namespace Pure.DI.Core;
+
+internal class Types(
+    ICache<SpecialTypeKey, INamedTypeSymbol?> asyncDisposableTypes)
+    : ITypes
+{
+    private static readonly Dictionary<SpecialType, string> TypeShortNames = new()
+    {
+        { SpecialType.IAsyncDisposable, $"{nameof(System)}.IAsyncDisposable" },
+        { SpecialType.Lock, $"{nameof(System)}.Threading.Lock" }
+    };
+
+    public INamedTypeSymbol? TryGet(SpecialType specialType, Compilation compilation) =>
+        asyncDisposableTypes.Get(
+            new SpecialTypeKey(specialType, compilation),
+            i => i.Compilation.GetTypeByMetadataName(TypeShortNames[specialType]));
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Generator.cs b/src/Pure.DI.Core/Generator.cs
index 22ecd76f..8d164688 100644
--- a/src/Pure.DI.Core/Generator.cs
+++ b/src/Pure.DI.Core/Generator.cs
@@ -138,11 +138,12 @@ private void Setup() => DI.Setup()
             .DefaultLifetime(Lifetime.PerResolve)
                 .Bind().To<TypeResolver>()
                 .Bind().To<LogObserver>()
-                .Bind().To<AsyncDisposableSettings>()
+                .Bind().To<Types>()
                 .Bind().To<Filter>()
                 .Bind("UniqueTags").To<IdGenerator>()
                 .Bind("GenericType").To<IdGenerator>()
                 .Bind("Injection").To<IdGenerator>()
                 .Bind().To<IdGenerator>()
-                .Bind().To<Registry<TT>>();
+                .Bind().To<Registry<TT>>()
+                .Bind().To<Locks>();
 }
\ No newline at end of file
diff --git a/src/Pure.DI.MS/Pure.DI.MS.csproj b/src/Pure.DI.MS/Pure.DI.MS.csproj
index f7b1778f..9c0c693e 100644
--- a/src/Pure.DI.MS/Pure.DI.MS.csproj
+++ b/src/Pure.DI.MS/Pure.DI.MS.csproj
@@ -19,7 +19,7 @@
             <Pack>true</Pack>
             <PackagePath>contentFiles/cs</PackagePath>
         </Compile>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/.template.config/template.json b/src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/.template.config/template.json
index 0cf264a3..28f2d536 100644
--- a/src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/.template.config/template.json
+++ b/src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/.template.config/template.json
@@ -30,7 +30,7 @@
     "framework": {
       "type": "parameter",
       "datatype": "string",
-      "description": "The target framework for the project (e.g. net8.0).",
+      "description": "The target framework for the project (e.g. net9.0).",
       "defaultValue": ""
     },
     "frameworkDefault": {
@@ -43,7 +43,7 @@
         "cases": [
           {
             "condition": "(framework == '')",
-            "value": "net8.0"
+            "value": "net9.0"
           },
           {
             "condition": "(framework != '')",
diff --git a/src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/.template.config/template.json b/src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/.template.config/template.json
index ebbf8092..99c046da 100644
--- a/src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/.template.config/template.json
+++ b/src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/.template.config/template.json
@@ -30,7 +30,7 @@
     "framework": {
       "type": "parameter",
       "datatype": "string",
-      "description": "The target framework for the project (e.g. net8.0).",
+      "description": "The target framework for the project (e.g. net9.0).",
       "defaultValue": ""
     },
     "frameworkDefault": {
@@ -43,7 +43,7 @@
         "cases": [
           {
             "condition": "(framework == '')",
-            "value": "net8.0"
+            "value": "net9.0"
           },
           {
             "condition": "(framework != '')",
diff --git a/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj b/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
index b247ca4e..57d8b488 100644
--- a/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
+++ b/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
@@ -4,7 +4,7 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj"/>
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj"/>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(AnalyzerRoslynPackageVersion)" PrivateAssets="all"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="xunit" Version="2.9.2" />
diff --git a/tests/Pure.DI.Tests/Pure.DI.Tests.csproj b/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
index 373d51a9..7aacceb7 100644
--- a/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
+++ b/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
@@ -2,7 +2,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
         <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
diff --git a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
index 3571c0a4..fadcfdad 100644
--- a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
+++ b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
@@ -14,9 +14,9 @@
         <Compile Include="..\..\src\Pure.DI.Abstractions\any\Pure.DI\Abstractions\*.g.cs"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
         <PackageReference Include="Castle.Core" Version="5.1.1"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
         <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>