edits

src/HotChocolate/Caching/src/Caching/QueryCacheMiddleware.cs

@@ -5,15 +5,22 @@
 
 namespace HotChocolate.Caching;
 
-internal sealed class QueryCacheMiddleware(
-    RequestDelegate next,
-    [SchemaService] ICacheControlOptionsAccessor optionsAccessor)
+internal sealed class QueryCacheMiddleware
 {
-    private readonly ICacheControlOptions _options = optionsAccessor.CacheControl;
+    private readonly ICacheControlOptions _options;
+    private readonly RequestDelegate _next;
+
+    private QueryCacheMiddleware(
+        RequestDelegate next,
+        [SchemaService] ICacheControlOptionsAccessor optionsAccessor)
+    {
+        _next = next;
+        _options = optionsAccessor.CacheControl;
+    }
 
     public async ValueTask InvokeAsync(IRequestContext context)
     {
-        await next(context).ConfigureAwait(false);
+        await _next(context).ConfigureAwait(false);
 
         if (!_options.Enable || context.ContextData.ContainsKey(SkipQueryCaching))
         {

src/HotChocolate/Caching/test/Caching.Tests/HttpCachingTests.cs

@@ -2,9 +2,9 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using CookieCrumble;
 using HotChocolate.Types;
 using Microsoft.Extensions.DependencyInjection;
-using Snapshooter.Xunit;
 using Xunit;
 
 namespace HotChocolate.Caching.Http.Tests;

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.JustScope_Should_Not_Cache.snap

@@ -1,4 +1,4 @@
-{
+{
   "Headers": [],
   "ContentHeaders": [
     {
@@ -9,4 +9,4 @@
     }
   ],
   "Body": "{\"data\":{\"field\":\"\"}}"
-}
+}

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.MaxAgeAndScope_Should_Cache.snap

@@ -1,4 +1,4 @@
-{
+{
   "Headers": [
     {
       "Key": "Cache-Control",
@@ -16,4 +16,4 @@
     }
   ],
   "Body": "{}"
-}
+}

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.MaxAge_NonZero_Should_Cache.snap

@@ -1,4 +1,4 @@
-{
+{
   "Headers": [
     {
       "Key": "Cache-Control",
@@ -16,4 +16,4 @@
     }
   ],
   "Body": "{}"
-}
+}

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.MaxAge_Zero_Should_Cache.snap

@@ -1,4 +1,4 @@
-{
+{
   "Headers": [
     {
       "Key": "Cache-Control",
@@ -16,4 +16,4 @@
     }
   ],
   "Body": "{}"
-}
+}

src/HotChocolate/Core/src/Execution/Pipeline/OperationResolverMiddleware.cs

@@ -162,14 +162,19 @@ private bool CoerceVariable(
         var variables = CoerceVariables(context, _coercionHelper, operationDefinition.VariableDefinitions);
         return variables.GetVariable<bool>(variable.Name.Value);
     }
-    
+
     public static RequestCoreMiddleware Create()
         => (core, next) =>
         {
             var operationCompilerPool = core.Services.GetRequiredService<ObjectPool<OperationCompiler>>();
-            var optimizers = core.Services.GetRequiredService<IEnumerable<IOperationCompilerOptimizer>>();
+            var optimizers1 = core.Services.GetRequiredService<IEnumerable<IOperationCompilerOptimizer>>();
+            var optimizers2 = core.SchemaServices.GetRequiredService<IEnumerable<IOperationCompilerOptimizer>>();
             var coercionHelper = core.Services.GetRequiredService<VariableCoercionHelper>();
-            var middleware = new OperationResolverMiddleware(next, operationCompilerPool, optimizers, coercionHelper);
+            var middleware = new OperationResolverMiddleware(
+                next,
+                operationCompilerPool,
+                optimizers1.Concat(optimizers2),
+                coercionHelper);
             return context => middleware.InvokeAsync(context);
         };
-}
+}