diff --git a/src/Microsoft.AspNetCore.Http.Features/FeatureReferences.cs b/src/Microsoft.AspNetCore.Http.Features/FeatureReferences.cs
index f69094c2..a7131414 100644
--- a/src/Microsoft.AspNetCore.Http.Features/FeatureReferences.cs
+++ b/src/Microsoft.AspNetCore.Http.Features/FeatureReferences.cs
@@ -37,7 +37,7 @@ public TFeature Fetch<TFeature, TState>(
             }
 
             var feature = cached;
-            if (feature == null)
+            if (feature == null || cleared)
             {
                 feature = Collection.Get<TFeature>();
                 if (feature == null)
@@ -45,10 +45,7 @@ public TFeature Fetch<TFeature, TState>(
                     feature = factory(state);
 
                     Collection.Set(feature);
-                    if (!cleared)
-                    {
-                        Cache = default(TCache);
-                    }
+
                     Revision = Collection.Revision;
                 }
                 cached = feature;