diff --git a/src/Polly/Caching/DefaultCacheKeyStrategy.cs b/src/Polly/Caching/DefaultCacheKeyStrategy.cs
index 12272f73eff..5cff753f529 100644
--- a/src/Polly/Caching/DefaultCacheKeyStrategy.cs
+++ b/src/Polly/Caching/DefaultCacheKeyStrategy.cs
@@ -4,7 +4,6 @@ namespace Polly.Caching;
 /// <summary>
 /// The default cache key strategy for <see cref="CachePolicy"/>.  Returns the property <see cref="Context.OperationKey"/>.
 /// </summary>
-#pragma warning disable CA1062 // Validate arguments of public methods
 public class DefaultCacheKeyStrategy : ICacheKeyStrategy
 {
     /// <summary>
@@ -12,8 +11,15 @@ public class DefaultCacheKeyStrategy : ICacheKeyStrategy
     /// </summary>
     /// <param name="context">The execution context.</param>
     /// <returns>The cache key.</returns>
-    public string GetCacheKey(Context context) =>
-        context.OperationKey;
+    public string GetCacheKey(Context context)
+    {
+        if (context is null)
+        {
+            throw new ArgumentNullException(nameof(context));
+        }
+
+        return context.OperationKey;
+    }
 
     /// <summary>
     /// Gets an instance of the <see cref="DefaultCacheKeyStrategy"/>.
diff --git a/test/Polly.Specs/Caching/DefaultCacheKeyStrategySpecs.cs b/test/Polly.Specs/Caching/DefaultCacheKeyStrategySpecs.cs
index c81162040d4..0158dc06a22 100644
--- a/test/Polly.Specs/Caching/DefaultCacheKeyStrategySpecs.cs
+++ b/test/Polly.Specs/Caching/DefaultCacheKeyStrategySpecs.cs
@@ -2,6 +2,14 @@
 
 public class DefaultCacheKeyStrategySpecs
 {
+    [Fact]
+    public void Should_throw_when_context_is_null()
+    {
+        Context context = null!;
+        Action action = () => DefaultCacheKeyStrategy.Instance.GetCacheKey(context);
+        action.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("context");
+    }
+
     [Fact]
     public void Should_return_Context_OperationKey_as_cache_key()
     {