diff --git a/.build/Helpers.cs b/.build/Helpers.cs
index fb08e4b0ad7..13e7583542a 100644
--- a/.build/Helpers.cs
+++ b/.build/Helpers.cs
@@ -78,7 +78,7 @@ public static IReadOnlyCollection<Output> DotNetBuildSonarSolution(
         var workingDirectory = Path.GetDirectoryName(solutionFile);
         var list = new List<Output>();
 
-        list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)}", workingDirectory));
+        list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)} --format sln", workingDirectory));
 
         var projectsArg = string.Join(" ", projects.Select(t => $"\"{t}\""));
 
@@ -99,7 +99,7 @@ public static IReadOnlyCollection<Output> DotNetBuildTestSolution(
         var workingDirectory = Path.GetDirectoryName(solutionFile);
         var list = new List<Output>();
 
-        list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)}", workingDirectory));
+        list.AddRange(DotNetTasks.DotNet($"new sln -n {Path.GetFileNameWithoutExtension(solutionFile)} --format sln", workingDirectory));
 
         var projectsArg = string.Join(" ", projects.Select(t => $"\"{t}\""));
 
diff --git a/src/HotChocolate/Core/src/Validation/DocumentValidator.cs b/src/HotChocolate/Core/src/Validation/DocumentValidator.cs
index b2a4e199121..f77d845142e 100644
--- a/src/HotChocolate/Core/src/Validation/DocumentValidator.cs
+++ b/src/HotChocolate/Core/src/Validation/DocumentValidator.cs
@@ -126,6 +126,8 @@ public DocumentValidatorResult Validate(
                     break;
                 }
 
+                context.Reset();
+
                 start = ref Unsafe.Add(ref start, 1)!;
             }
 
@@ -156,7 +158,6 @@ private DocumentValidatorContext RentContext(
 
     private void ReturnContext(DocumentValidatorContext context)
     {
-        context.Clear();
         _contextPool.Return(context);
     }
 }
diff --git a/src/HotChocolate/Core/src/Validation/Rules/FieldVisitor.cs b/src/HotChocolate/Core/src/Validation/Rules/FieldVisitor.cs
index 6ceccc7d8db..0f691ba42b8 100644
--- a/src/HotChocolate/Core/src/Validation/Rules/FieldVisitor.cs
+++ b/src/HotChocolate/Core/src/Validation/Rules/FieldVisitor.cs
@@ -532,6 +532,7 @@ protected internal override void Reset()
                     s_fieldInfoPool.Return(_buffers[i]);
                 }
 
+                _buffers.Clear();
                 _buffers.Push(buffer);
             }
             else
diff --git a/src/HotChocolate/Core/src/Validation/Rules/ValueVisitor.cs b/src/HotChocolate/Core/src/Validation/Rules/ValueVisitor.cs
index 5a2259b7fad..a4fcb8246a7 100644
--- a/src/HotChocolate/Core/src/Validation/Rules/ValueVisitor.cs
+++ b/src/HotChocolate/Core/src/Validation/Rules/ValueVisitor.cs
@@ -186,7 +186,7 @@ protected override ISyntaxVisitorAction Enter(
         ObjectValueNode node,
         DocumentValidatorContext context)
     {
-        var inputFieldNames = context.Features.GetOrSet<ValueVisitorFeature>().InputFieldNames;
+        var inputFieldNames = context.Features.GetRequired<ValueVisitorFeature>().InputFieldNames;
         inputFieldNames.Clear();
 
         for (var i = 0; i < node.Fields.Count; i++)
diff --git a/src/HotChocolate/CostAnalysis/src/CostAnalysis/CostAnalyzer.cs b/src/HotChocolate/CostAnalysis/src/CostAnalysis/CostAnalyzer.cs
index 6b7fce17660..646681a375a 100644
--- a/src/HotChocolate/CostAnalysis/src/CostAnalysis/CostAnalyzer.cs
+++ b/src/HotChocolate/CostAnalysis/src/CostAnalysis/CostAnalyzer.cs
@@ -368,6 +368,8 @@ protected internal override void Reset()
     {
         NonNullString = null!;
         FieldSets.Clear();
+        SelectionSetCost.Clear();
+        Processed.Clear();
 
         if (_buffers.Count > 1)
         {
@@ -379,6 +381,7 @@ protected internal override void Reset()
                 s_fieldInfoPool.Return(_buffers[i]);
             }
 
+            _buffers.Clear();
             _buffers.Push(buffer);
         }
         else