diff --git a/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj b/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj
index 0be3042..28bcff6 100644
--- a/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj
+++ b/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj
@@ -11,7 +11,7 @@
     <PropertyGroup>
         <Product>Nostr </Product>
         <Description>Allows you to verify your nostr account with NIP5 and zap like the rest of the crazies</Description>
-        <Version>1.0.6</Version>
+        <Version>1.0.7</Version>
     </PropertyGroup>
     <!-- Plugin development properties -->
     <PropertyGroup>
diff --git a/Plugins/BTCPayServer.Plugins.NIP05/LnurlDescriptionFilter.cs b/Plugins/BTCPayServer.Plugins.NIP05/LnurlDescriptionFilter.cs
index 0e3429c..a707413 100644
--- a/Plugins/BTCPayServer.Plugins.NIP05/LnurlDescriptionFilter.cs
+++ b/Plugins/BTCPayServer.Plugins.NIP05/LnurlDescriptionFilter.cs
@@ -74,7 +74,7 @@ public class LnurlDescriptionFilter : PluginHookFilter<string>
                             return arg;
                         }
 
-                        var entry = _memoryCache.CreateEntry(Nip05Plugin.GetZapRequestCacheKey(invoiceId.ToString()));
+                        using var entry = _memoryCache.CreateEntry(Nip05Plugin.GetZapRequestCacheKey(invoiceId.ToString()));
                         entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5);
                         entry.SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
                         entry.SetValue(nostr);
diff --git a/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs b/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs
index 3930d13..4db3b7b 100644
--- a/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs
+++ b/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs
@@ -43,7 +43,6 @@ public class Zapper : IHostedService
     {
         while (!cancellationToken.IsCancellationRequested)
         {
-
             if (_pendingZapEvents.Any())
             {
                 _logger.LogInformation($"Attempting to send {_pendingZapEvents.Count} zap receipts");
@@ -94,7 +93,15 @@ public class Zapper : IHostedService
                 }
                 else
                 {
-                    await Task.Delay(100, waitingToken.Token);
+                    try
+                    {
+
+                        await Task.Delay(100, waitingToken.Token);
+                    }
+                    catch (TaskCanceledException e)
+                    {
+                        break;
+                    }
                 }
             }
         }