diff --git a/Directory.Packages.props b/Directory.Packages.props
index 416a91cec339..59cb1476c215 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -43,6 +43,7 @@
   <ItemGroup>
     <PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.0" />
     <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.1.7" />
     <PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
     <PackageVersion Include="Examine" Version="3.7.1" />
     <PackageVersion Include="Examine.Core" Version="3.7.1" />
diff --git a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
index ccd5897494eb..0fb86bf63019 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
+++ b/src/Umbraco.PublishedCache.HybridCache/Extensions/HybridCacheExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using AsyncKeyedLock;
 using Microsoft.Extensions.Caching.Hybrid;
 
 namespace Umbraco.Cms.Infrastructure.HybridCache.Extensions;
@@ -10,7 +11,7 @@ internal static class HybridCacheExtensions
 {
     // Per-key semaphores to ensure the GetOrCreateAsync + RemoveAsync sequence
     // executes atomically for a given cache key.
-    private static readonly ConcurrentDictionary<string, SemaphoreSlim> _keyLocks = new();
+    private static readonly AsyncKeyedLocker<string> _keyLocks = new();
 
     /// <summary>
     /// Returns true if the cache contains an item with a matching key.
@@ -45,13 +46,7 @@ public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.
     {
         var exists = true;
 
-        // Acquire a per-key semaphore so that GetOrCreateAsync and the possible RemoveAsync
-        // complete without another thread retrieving/creating the same key in-between.
-        SemaphoreSlim sem = _keyLocks.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
-
-        await sem.WaitAsync().ConfigureAwait(false);
-
-        try
+        using (await _keyLocks.LockAsync(key, token))
         {
             T? result = await cache.GetOrCreateAsync<T?>(
                 key,
@@ -74,16 +69,5 @@ public static async Task<bool> ExistsAsync<T>(this Microsoft.Extensions.Caching.
 
             return (exists, result);
         }
-        finally
-        {
-            sem.Release();
-
-            // Only remove the semaphore mapping if it still points to the same instance we used.
-            // This avoids removing another thread's semaphore or corrupting the map.
-            if (_keyLocks.TryGetValue(key, out SemaphoreSlim? current) && ReferenceEquals(current, sem))
-            {
-                _keyLocks.TryRemove(key, out _);
-            }
-        }
     }
 }
diff --git a/src/Umbraco.PublishedCache.HybridCache/Umbraco.PublishedCache.HybridCache.csproj b/src/Umbraco.PublishedCache.HybridCache/Umbraco.PublishedCache.HybridCache.csproj
index da5227544d56..2487466d49dd 100644
--- a/src/Umbraco.PublishedCache.HybridCache/Umbraco.PublishedCache.HybridCache.csproj
+++ b/src/Umbraco.PublishedCache.HybridCache/Umbraco.PublishedCache.HybridCache.csproj
@@ -12,6 +12,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <PackageReference Include="AsyncKeyedLock" />
     <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" />
     <PackageReference Include="MessagePack" />
     <PackageReference Include="K4os.Compression.LZ4" />