diff --git a/src/AzurePipelines/PipelineCachingCacheClient.cs b/src/AzurePipelines/PipelineCachingCacheClient.cs
index 2155c57..a4613fa 100644
--- a/src/AzurePipelines/PipelineCachingCacheClient.cs
+++ b/src/AzurePipelines/PipelineCachingCacheClient.cs
@@ -185,7 +185,7 @@ string s when int.TryParse(s, out int i) => i,
         _startupTask = Task.Run(() => QueryPipelineCaching(rootContext, new VisualStudio.Services.PipelineCache.WebApi.Fingerprint("init"), CancellationToken.None));
     }
 
-    protected override async Task AddNodeAsync(
+    protected override async Task<AddNodeResult> AddNodeAsync(
         Context context,
         StrongFingerprint fingerprint,
         IReadOnlyDictionary<string, ContentHash> outputs,
@@ -195,10 +195,11 @@ protected override async Task AddNodeAsync(
     {
         if (_remoteCacheIsReadOnly)
         {
-            return;
+            return AddNodeResult.Skipped;
         }
 
         // write the SFP -> manifest
+        bool sfpAddded;
         List<string> tempFilePaths = new();
         try
         {
@@ -268,7 +269,7 @@ protected override async Task AddNodeAsync(
                 infos = outputs.Keys.Select(f => new FileInfo(f)).ToArray();
             }
 
-            var result = await WithHttpRetries(
+            PublishResult result = await WithHttpRetries(
                 () => _manifestClient.PublishAsync(RepoRoot, infos, extras, new ArtifactPublishOptions(), manifestFileOutputPath: null, cancellationToken),
                 cacheContext: context,
                 message: $"Publishing content for {fingerprint}",
@@ -292,12 +293,24 @@ protected override async Task AddNodeAsync(
                 result.ProofNodes,
                 ContentFormatConstants.Files);
 
-            CreateResult createResult = await WithHttpRetries(
-                () => _cacheClient.CreatePipelineCacheArtifactAsync(entry, null, cancellationToken),
+            sfpAddded = await WithHttpRetries(
+                async () =>
+                {
+                    try
+                    {
+                        CreateResult createResult = await _cacheClient.CreatePipelineCacheArtifactAsync(entry, null, cancellationToken);
+                        Tracer.Debug(context, $"Cache entry for {fingerprint} stored in scope `{createResult.ScopeUsed}`");
+                        return true;
+                    }
+                    catch (PipelineCacheItemAlreadyExistsException)
+                    {
+                        Tracer.Debug(context, $"Cache entry for {fingerprint} already exists.");
+                        return false;
+                    }
+                },
                 cacheContext: context,
                 message: $"Storing cache key for {fingerprint}",
                 cancellationToken);
-            Tracer.Debug(context, $"Cache entry stored in scope `{createResult.ScopeUsed}`");
         }
         finally
         {
@@ -310,6 +323,7 @@ protected override async Task AddNodeAsync(
         }
 
         // add the WFP -> Selector mapping
+        bool wfpAddded;
         List<TempFile> pathSetTempFiles = new();
         try
         {
@@ -363,13 +377,13 @@ protected override async Task AddNodeAsync(
                 }
             }
 
-            var result = await WithHttpRetries(
+            PublishResult result = await WithHttpRetries(
                 () => _manifestClient.PublishAsync(TempFolder, infos, extras, new ArtifactPublishOptions(), manifestFileOutputPath: null, cancellationToken),
                 cacheContext: context,
                 message: $"Publishing content for {fingerprint}",
                 cancellationToken);
 
-            var entry = new CreatePipelineCacheArtifactContract(
+            CreatePipelineCacheArtifactContract entry = new(
                 DomainId,
                 new VisualStudio.Services.PipelineCache.WebApi.Fingerprint(key.Split(KeySegmentSeperator)),
                 result.ManifestId,
@@ -377,13 +391,27 @@ protected override async Task AddNodeAsync(
                 result.ProofNodes,
                 ContentFormatConstants.Files);
 
-            CreateResult createResult = await WithHttpRetries(
-                () => _cacheClient.CreatePipelineCacheArtifactAsync(entry, null, cancellationToken),
+            wfpAddded = await WithHttpRetries(
+                async () =>
+                {
+                    try
+                    {
+                        CreateResult createResult = await _cacheClient.CreatePipelineCacheArtifactAsync(entry, null, cancellationToken);
+                        Tracer.Debug(context, $"SFP `{fingerprint}` stored in scope `{createResult.ScopeUsed}`");
+                        return true;
+                    }
+                    catch (PipelineCacheItemAlreadyExistsException)
+                    {
+                        return false;
+                    }
+                },
                 cacheContext: context,
                 message: $"Storing cache key for {fingerprint}",
                 cancellationToken);
 
-            Tracer.Debug(context, $"SFP `{fingerprint}` stored in scope `{createResult.ScopeUsed}`");
+            return wfpAddded || sfpAddded
+                ? AddNodeResult.Added
+                : AddNodeResult.AlreadyExists;
         }
         finally
         {
@@ -733,13 +761,13 @@ private string ComputeSelectorsKey(BuildXL.Cache.MemoizationStore.Interfaces.Ses
     private Task<T> WithHttpRetries<T>(Func<Task<T>> taskFactory, Context cacheContext, string message, CancellationToken token)
     {
         return AsyncHttpRetryHelper<T>.InvokeAsync(
-                taskFactory,
-                maxRetries: 10,
-                tracer: _azureDevopsTracer,
-                canRetryDelegate: _ => true, // retry on any exception
-                cancellationToken: token,
-                continueOnCapturedContext: false,
-                context: EmbedCacheContext(cacheContext, message));
+            taskFactory,
+            maxRetries: 10,
+            tracer: _azureDevopsTracer,
+            canRetryDelegate: _ => true, // retry on any exception
+            cancellationToken: token,
+            continueOnCapturedContext: false,
+            context: EmbedCacheContext(cacheContext, message));
     }
 
     public override async ValueTask DisposeAsync()
diff --git a/src/Common/Caching/CacheClient.cs b/src/Common/Caching/CacheClient.cs
index 62a906b..222c1d5 100644
--- a/src/Common/Caching/CacheClient.cs
+++ b/src/Common/Caching/CacheClient.cs
@@ -28,6 +28,13 @@
 
 namespace Microsoft.MSBuildCache.Caching;
 
+public enum AddNodeResult
+{
+    Added,
+    AlreadyExists,
+    Skipped
+}
+
 public abstract class CacheClient : ICacheClient
 {
     private static readonly byte[] EmptySelectorOutput = new byte[1];
@@ -122,7 +129,8 @@ protected CacheClient(
     /* abstract methods for subclasses to implement */
     protected abstract Task<OpenStreamResult> OpenStreamAsync(Context context, ContentHash contentHash, CancellationToken cancellationToken);
 
-    protected abstract Task AddNodeAsync(
+    /// <returns>True if added, false if already exists. Otherwise throws.</returns>
+    protected abstract Task<AddNodeResult> AddNodeAsync(
         Context context,
         StrongFingerprint fingerprint,
         IReadOnlyDictionary<string, ContentHash> outputs,
@@ -342,9 +350,7 @@ public async Task AddNodeInternalAsync(
 
         StrongFingerprint cacheStrongFingerprint = new(cacheWeakFingerprint, selector);
 
-        Tracer.Debug(context, $"StrongFingerprint is {cacheStrongFingerprint} for {nodeContext.Id}");
-
-        await AddNodeAsync(
+        AddNodeResult addresult = await AddNodeAsync(
             context,
             cacheStrongFingerprint,
             outputsToCache,
@@ -352,6 +358,8 @@ await AddNodeAsync(
             pathSetBytes,
             cancellationToken);
 
+        Tracer.Debug(context, $"Adding StrongFingerprint {cacheStrongFingerprint} for {nodeContext.Id} resulted in {addresult}.");
+
         if (_localCacheStateManager is not null)
         {
             await _localCacheStateManager.WriteStateFileAsync(nodeContext, nodeBuildResult);
diff --git a/src/Common/Caching/CasCacheClient.cs b/src/Common/Caching/CasCacheClient.cs
index 1277575..f9ca237 100644
--- a/src/Common/Caching/CasCacheClient.cs
+++ b/src/Common/Caching/CasCacheClient.cs
@@ -111,7 +111,7 @@ protected override async IAsyncEnumerable<Selector> GetSelectors(Context context
     protected override Task<OpenStreamResult> OpenStreamAsync(Context context, ContentHash contentHash, CancellationToken cancellationToken)
         => _twoLevelCacheSession.OpenStreamAsync(context, contentHash, cancellationToken);
 
-    protected override async Task AddNodeAsync(
+    protected override async Task<AddNodeResult> AddNodeAsync(
         Context context,
         StrongFingerprint fingerprint,
         IReadOnlyDictionary<string, ContentHash> outputs,
@@ -253,6 +253,10 @@ static async Task checkUploadResultsAsync(List<Task<PutFileOperation>> uploadTas
             throw new CacheException($"{nameof(_twoLevelCacheSession.AddOrGetContentHashListAsync)} failed for {fingerprint}.");
         }
 
+        return contentHashList.Equals(addResult?.ContentHashListWithDeterminism.ContentHashList)
+            ? AddNodeResult.Added
+            : AddNodeResult.AlreadyExists;
+
         // TODO dfederm: Handle CHL races
     }