diff --git a/Utilities.AspNetCore.Azure/Utilities.AspNetCore.Azure.csproj b/Utilities.AspNetCore.Azure/Utilities.AspNetCore.Azure.csproj
index 1b0186a..152669f 100644
--- a/Utilities.AspNetCore.Azure/Utilities.AspNetCore.Azure.csproj
+++ b/Utilities.AspNetCore.Azure/Utilities.AspNetCore.Azure.csproj
@@ -16,7 +16,7 @@
     <Authors>SidekickNet</Authors>
     <Description>Provides Azure related utilities for ASP.NET Core.</Description>
     <Copyright>Copyright (c) Zhang Shen. All rights reserved.</Copyright>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/cnshenj/SidekickNet.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/cnshenj/SidekickNet</PackageProjectUrl>
diff --git a/Utilities.AspNetCore/Utilities.AspNetCore.csproj b/Utilities.AspNetCore/Utilities.AspNetCore.csproj
index b2022df..8748797 100644
--- a/Utilities.AspNetCore/Utilities.AspNetCore.csproj
+++ b/Utilities.AspNetCore/Utilities.AspNetCore.csproj
@@ -16,7 +16,7 @@
     <Authors>SidekickNet</Authors>
     <Description>Provides utility methods for ASP.NET Core.</Description>
     <Copyright>Copyright (c) Zhang Shen. All rights reserved.</Copyright>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/cnshenj/SidekickNet.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/cnshenj/SidekickNet</PackageProjectUrl>
diff --git a/Utilities.Azure/Utilities.Azure.csproj b/Utilities.Azure/Utilities.Azure.csproj
index bc32354..9a44baa 100644
--- a/Utilities.Azure/Utilities.Azure.csproj
+++ b/Utilities.Azure/Utilities.Azure.csproj
@@ -16,7 +16,7 @@
     <Authors>SidekickNet</Authors>
     <Description>Provides utility methods for Azure resources.</Description>
     <Copyright>Copyright (c) Zhang Shen. All rights reserved.</Copyright>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/cnshenj/SidekickNet.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/cnshenj/SidekickNet</PackageProjectUrl>
diff --git a/Utilities.Json/Utilities.Json.csproj b/Utilities.Json/Utilities.Json.csproj
index 562a284..c719460 100644
--- a/Utilities.Json/Utilities.Json.csproj
+++ b/Utilities.Json/Utilities.Json.csproj
@@ -17,7 +17,7 @@
     <Authors>SidekickNet</Authors>
     <Description>Provides utility methods for JSON.</Description>
     <Copyright>Copyright (c) Zhang Shen. All rights reserved.</Copyright>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/cnshenj/SidekickNet.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/cnshenj/SidekickNet</PackageProjectUrl>
diff --git a/Utilities.MessagePack/Utilities.MessagePack.csproj b/Utilities.MessagePack/Utilities.MessagePack.csproj
index 5fb0102..6b2340c 100644
--- a/Utilities.MessagePack/Utilities.MessagePack.csproj
+++ b/Utilities.MessagePack/Utilities.MessagePack.csproj
@@ -18,7 +18,7 @@
     <Authors>SidekickNet</Authors>
     <Description>Provides utility methods for MessagePack.</Description>
     <Copyright>Copyright (c) Zhang Shen. All rights reserved.</Copyright>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/cnshenj/SidekickNet.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/cnshenj/SidekickNet</PackageProjectUrl>
diff --git a/Utilities/InterlockedDictionary.cs b/Utilities/InterlockedDictionary.cs
index 8047885..c38e4a1 100644
--- a/Utilities/InterlockedDictionary.cs
+++ b/Utilities/InterlockedDictionary.cs
@@ -38,7 +38,7 @@ public class InterlockedDictionary<TKey, TValue> : Dictionary<TKey, TValue>
         /// <param name="lockTimeout">A <see cref="TimeSpan"/> that represents the time period to wait to acquire access locks.</param>
         public InterlockedDictionary(TimeSpan? lockTimeout = default)
         {
-            this.lockFactory = new AccessLockFactory<TKey>(() => new LocalSemaphore(1, 1), lockTimeout);
+            this.lockFactory = new AccessLockFactory<TKey>(_ => new LocalSemaphore(1, 1), lockTimeout);
         }
 
         /// <summary>
diff --git a/Utilities/Synchronization/AccessLockFactory.cs b/Utilities/Synchronization/AccessLockFactory.cs
index 7c598ce..a7cabb0 100644
--- a/Utilities/Synchronization/AccessLockFactory.cs
+++ b/Utilities/Synchronization/AccessLockFactory.cs
@@ -17,7 +17,7 @@ public class AccessLockFactory<TKey>
     {
         private readonly ConcurrentDictionary<TKey, ISynchronizationPrimitive> primitives = new();
 
-        private readonly Func<ISynchronizationPrimitive> primitiveFactory;
+        private readonly Func<TKey, ISynchronizationPrimitive> primitiveFactory;
 
         private readonly TimeSpan timeout;
 
@@ -26,7 +26,7 @@ public class AccessLockFactory<TKey>
         /// </summary>
         /// <param name="primitiveFactory">The function that generate synchronization primitives.</param>
         /// <param name="timeout">A <see cref="TimeSpan"/> that represents the default time period to wait to acquire access locks.</param>
-        public AccessLockFactory(Func<ISynchronizationPrimitive> primitiveFactory, TimeSpan? timeout = default)
+        public AccessLockFactory(Func<TKey, ISynchronizationPrimitive> primitiveFactory, TimeSpan? timeout = default)
         {
             this.primitiveFactory = primitiveFactory ?? throw new ArgumentNullException(nameof(primitiveFactory));
             this.timeout = timeout ?? AccessLock.Indefinite;
@@ -62,7 +62,7 @@ public async Task<AccessLock> GetLockAsync(TKey key, TimeSpan? timeout = default
 
         private AccessLock CreateLock(TKey key)
         {
-            var primitive = this.primitives.GetOrAdd(key, _ => this.primitiveFactory());
+            var primitive = this.primitives.GetOrAdd(key, this.primitiveFactory);
             return new AccessLock(primitive);
         }
     }
diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj
index f0451a1..10befc8 100644
--- a/Utilities/Utilities.csproj
+++ b/Utilities/Utilities.csproj
@@ -17,7 +17,7 @@
     <Authors>SidekickNet</Authors>
     <Description>Provides utility methods for .NET objects, e.g. strings, collections.</Description>
     <Copyright>Copyright (c) Zhang Shen. All rights reserved.</Copyright>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/cnshenj/SidekickNet.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/cnshenj/SidekickNet</PackageProjectUrl>