diff --git a/src/Foundatio/Utility/AsyncDisposableAction.cs b/src/Foundatio/Utility/AsyncDisposableAction.cs
new file mode 100644
index 00000000..cefa2d0f
--- /dev/null
+++ b/src/Foundatio/Utility/AsyncDisposableAction.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Foundatio.Utility;
+
+/// <summary>
+/// A class that will call an <see cref="Func{TResult}"/> when Disposed.
+/// </summary>
+public sealed class AsyncDisposableAction : IAsyncDisposable
+{
+    private Func<Task> _exitTask;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DisposableAction"/> class.
+    /// </summary>
+    /// <param name="exitTask">The exit action.</param>
+    public AsyncDisposableAction(Func<Task> exitTask)
+    {
+        _exitTask = exitTask;
+    }
+
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+    /// </summary>
+    async ValueTask IAsyncDisposable.DisposeAsync()
+    {
+        var exitAction = Interlocked.Exchange(ref _exitTask, null);
+        if (exitAction is not null)
+            await _exitTask().AnyContext();
+    }
+}
diff --git a/src/Foundatio/Utility/DisposableAction.cs b/src/Foundatio/Utility/DisposableAction.cs
index fe6f1bd4..aea8bd95 100644
--- a/src/Foundatio/Utility/DisposableAction.cs
+++ b/src/Foundatio/Utility/DisposableAction.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 
 namespace Foundatio.Utility;
 
@@ -7,8 +8,7 @@ namespace Foundatio.Utility;
 /// </summary>
 public sealed class DisposableAction : IDisposable
 {
-    private readonly Action _exitAction;
-    private bool _disposed;
+    private Action _exitAction;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DisposableAction"/> class.
@@ -24,10 +24,7 @@ public DisposableAction(Action exitAction)
     /// </summary>
     void IDisposable.Dispose()
     {
-        if (_disposed)
-            return;
-
-        _exitAction();
-        _disposed = true;
+        var exitAction = Interlocked.Exchange(ref _exitAction, null);
+        exitAction?.Invoke();
     }
 }