diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
index a8db7c76da77..1d6754f0fe13 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
@@ -31,6 +31,7 @@
 import org.apache.lucene.facet.FacetResult;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.range.DoubleRange;
 import org.apache.lucene.facet.range.DoubleRangeFacetCounts;
@@ -213,9 +214,7 @@ public static Query getBoundingBoxQuery(
   /** User runs a query and counts facets. */
   public FacetResult search() throws IOException {
 
-    FacetsCollector fc = new FacetsCollector();
-
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new DoubleRangeFacetCounts(
diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
index dc916fc2c102..b36689817310 100644
--- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
+++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
@@ -28,6 +28,7 @@
 import org.apache.lucene.facet.FacetResult;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.taxonomy.FastTaxonomyFacetCounts;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
@@ -125,12 +126,10 @@ private List<FacetResult> facetsOnly() throws IOException {
     IndexSearcher searcher = new IndexSearcher(indexReader);
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
 
-    FacetsCollector fc = new FacetsCollector();
-
     // MatchAllDocsQuery is for "browsing" (counts facets
     // for all non-deleted docs in the index); normally
     // you'd use a "normal" query:
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     // Retrieve results
     List<FacetResult> results = new ArrayList<>();
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
index adbd6ffaad9a..8c78d9b01fd7 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java
@@ -73,8 +73,7 @@ public void testBasic() throws IOException {
     }
 
     IndexSearcher searcher = newSearcher(writer.getReader());
-    FacetsCollector fc = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     int visitedDocs = 0;
     DocIdSetIterator disi;
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
index c9aafbb67a51..590ed65ead14 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
@@ -73,8 +73,7 @@ public void testAddSameDocTwice() throws Exception {
     DirectoryReader indexReader = DirectoryReader.open(indexDir);
     DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
     IndexSearcher searcher = newSearcher(indexReader);
-    FacetsCollector fc = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = getTaxonomyFacetCounts(taxoReader, facetsConfig, fc);
     FacetResult res = facets.getTopChildren(10, "a");
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
index b61da63510aa..ff704f03d0b1 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java
@@ -59,9 +59,8 @@ public void testBasic() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     LongValueFacetCounts facets = new LongValueFacetCounts("field", fc);
 
@@ -111,9 +110,8 @@ public void testOnlyBigLongs() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     LongValueFacetCounts facets = new LongValueFacetCounts("field", fc);
 
@@ -143,9 +141,8 @@ public void testGetAllDims() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = new LongValueFacetCounts("field", fc);
 
@@ -204,7 +201,6 @@ public void testRandomSingleValued() throws Exception {
 
     int iters = atLeast(100);
     for (int iter = 0; iter < iters; iter++) {
-      FacetsCollector fc = new FacetsCollector();
       if (VERBOSE) {
         System.out.println("\nTEST: iter=" + iter);
         System.out.println("  test all docs");
@@ -231,7 +227,7 @@ public void testRandomSingleValued() throws Exception {
 
       LongValueFacetCounts facetCounts;
       if (random().nextBoolean()) {
-        s.search(new MatchAllDocsQuery(), fc);
+        FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
         if (random().nextBoolean()) {
           if (VERBOSE) {
             System.out.println("  use value source");
@@ -331,8 +327,8 @@ public void testRandomSingleValued() throws Exception {
         System.out.println("  test id range " + minId + "-" + maxId);
       }
 
-      fc = new FacetsCollector();
-      s.search(IntPoint.newRangeQuery("id", minId, maxId), fc);
+      FacetsCollector fc =
+          s.search(IntPoint.newRangeQuery("id", minId, maxId), new FacetsCollectorManager());
       if (random().nextBoolean()) {
         if (VERBOSE) {
           System.out.println("  use doc values");
@@ -481,7 +477,6 @@ public void testRandomMultiValued() throws Exception {
 
     int iters = atLeast(100);
     for (int iter = 0; iter < iters; iter++) {
-      FacetsCollector fc = new FacetsCollector();
       if (VERBOSE) {
         System.out.println("\nTEST: iter=" + iter);
         System.out.println("  test all docs");
@@ -505,7 +500,7 @@ public void testRandomMultiValued() throws Exception {
 
       LongValueFacetCounts facetCounts;
       if (random().nextBoolean()) {
-        s.search(new MatchAllDocsQuery(), fc);
+        FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
         if (VERBOSE) {
           System.out.println("  use doc values");
         }
@@ -577,8 +572,8 @@ public void testRandomMultiValued() throws Exception {
         System.out.println("  test id range " + minId + "-" + maxId);
       }
 
-      fc = new FacetsCollector();
-      s.search(IntPoint.newRangeQuery("id", minId, maxId), fc);
+      FacetsCollector fc =
+          s.search(IntPoint.newRangeQuery("id", minId, maxId), new FacetsCollectorManager());
       if (random().nextBoolean()) {
         facetCounts = new LongValueFacetCounts("field", fc);
       } else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
index 765c6759260b..db1bbfce8f36 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java
@@ -260,8 +260,7 @@ public void testStaleState() throws Exception {
     IndexSearcher searcher = newSearcher(writer.getReader());
     writer.close();
 
-    FacetsCollector c = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), c);
+    FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     // using a stale state
     expectThrows(IllegalStateException.class, () -> new StringValueFacetCounts(state, c));
@@ -339,8 +338,7 @@ private void checkFacetResult(
     StringDocValuesReaderState state =
         new StringDocValuesReaderState(searcher.getIndexReader(), "field");
 
-    FacetsCollector c = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), c);
+    FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     for (int topN : topNs) {
 
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
index 758ca3cb673d..2471c52295b6 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.LabelAndValue;
 import org.apache.lucene.facet.MultiDoubleValuesSource;
@@ -85,9 +86,8 @@ public void testBasicLong() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new LongRangeFacetCounts(
@@ -131,9 +131,8 @@ public void testBasicLongMultiValued() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new LongRangeFacetCounts(
@@ -182,9 +181,8 @@ public void testBasicLongMultiValuedMixedSegmentTypes() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new LongRangeFacetCounts(
@@ -223,9 +221,8 @@ public void testLongGetAllDims() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new LongRangeFacetCounts(
@@ -287,9 +284,8 @@ public void testLongMinMax() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new LongRangeFacetCounts(
@@ -327,9 +323,8 @@ public void testOverlappedEndStart() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new LongRangeFacetCounts(
@@ -363,9 +358,8 @@ public void testEmptyRangesSingleValued() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = new LongRangeFacetCounts("field", fc);
 
@@ -393,9 +387,8 @@ public void testEmptyRangesMultiValued() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = new LongRangeFacetCounts("field", fc);
 
@@ -539,10 +532,8 @@ public void testBasicDouble() throws Exception {
 
     IndexReader r = w.getReader();
 
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets =
         new DoubleRangeFacetCounts(
             "field",
@@ -577,10 +568,8 @@ public void testBasicDoubleMultiValued() throws Exception {
 
     IndexReader r = w.getReader();
 
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets =
         new DoubleRangeFacetCounts(
             "field",
@@ -626,9 +615,8 @@ public void testBasicDoubleMultiValuedMixedSegmentTypes() throws Exception {
     IndexReader r = w.getReader();
     w.close();
 
-    FacetsCollector fc = new FacetsCollector();
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets =
         new DoubleRangeFacetCounts(
@@ -756,8 +744,7 @@ public void testRandomLongsSingleValued() throws Exception {
         }
       }
 
-      FacetsCollector sfc = new FacetsCollector();
-      s.search(new MatchAllDocsQuery(), sfc);
+      FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
       Query fastMatchQuery;
       if (random().nextBoolean()) {
         if (random().nextBoolean()) {
@@ -953,8 +940,7 @@ public void testRandomLongsMultiValued() throws Exception {
         }
       }
 
-      FacetsCollector sfc = new FacetsCollector();
-      s.search(new MatchAllDocsQuery(), sfc);
+      FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
       Query fastMatchQuery;
       if (random().nextBoolean()) {
         if (random().nextBoolean()) {
@@ -1106,8 +1092,7 @@ public void testRandomDoublesSingleValued() throws Exception {
         }
       }
 
-      FacetsCollector sfc = new FacetsCollector();
-      s.search(new MatchAllDocsQuery(), sfc);
+      FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
       Query fastMatchFilter;
       if (random().nextBoolean()) {
         if (random().nextBoolean()) {
@@ -1276,8 +1261,7 @@ public void testRandomDoublesMultiValued() throws Exception {
         }
       }
 
-      FacetsCollector sfc = new FacetsCollector();
-      s.search(new MatchAllDocsQuery(), sfc);
+      FacetsCollector sfc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
       Query fastMatchFilter;
       if (random().nextBoolean()) {
         if (random().nextBoolean()) {
@@ -1352,10 +1336,8 @@ public void testMissingValues() throws Exception {
 
     IndexReader r = w.getReader();
 
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets =
         new LongRangeFacetCounts(
             "field",
@@ -1396,10 +1378,8 @@ public void testMissingValuesMultiValued() throws Exception {
 
     IndexReader r = w.getReader();
 
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher s = newSearcher(r);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets =
         new LongRangeFacetCounts(
             "field",
@@ -1544,12 +1524,10 @@ public void testCustomDoubleValuesSource() throws Exception {
 
     FacetsConfig config = new FacetsConfig();
 
-    FacetsCollector fc = new FacetsCollector();
-
     IndexReader r = writer.getReader();
 
     IndexSearcher s = newSearcher(r, false, false);
-    s.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = s.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     final DoubleRange[] ranges =
         new DoubleRange[] {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
index 355e73ddc1c9..23dfd3cf52f9 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
@@ -39,6 +39,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.LabelAndValue;
 import org.apache.lucene.index.IndexReader;
@@ -660,9 +661,8 @@ public void testStaleState() throws Exception {
         try (IndexReader r2 = writer.getReader()) {
           IndexSearcher searcher = newSearcher(r2);
 
-          FacetsCollector c = new FacetsCollector();
-
-          searcher.search(new MatchAllDocsQuery(), c);
+          FacetsCollector c =
+              searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
           expectThrows(
               IllegalStateException.class,
@@ -1392,8 +1392,7 @@ private static Facets getAllFacets(
       IndexSearcher searcher, SortedSetDocValuesReaderState state, ExecutorService exec)
       throws IOException, InterruptedException {
     if (random().nextBoolean()) {
-      FacetsCollector c = new FacetsCollector();
-      searcher.search(new MatchAllDocsQuery(), c);
+      FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
       if (exec != null) {
         return new ConcurrentSortedSetDocValuesFacetCounts(state, c, exec);
       } else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
index 3f4c7adeec39..eab05feb6682 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
@@ -28,6 +28,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.taxonomy.SearcherTaxonomyManager.SearcherAndTaxonomy;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -184,8 +185,8 @@ public void run() {
         SearcherAndTaxonomy pair = mgr.acquire();
         try {
           // System.out.println("search maxOrd=" + pair.taxonomyReader.getSize());
-          FacetsCollector sfc = new FacetsCollector();
-          pair.searcher.search(new MatchAllDocsQuery(), sfc);
+          FacetsCollector sfc =
+              pair.searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
           Facets facets = getTaxonomyFacetCounts(pair.taxonomyReader, config, sfc);
           FacetResult result = facets.getTopChildren(10, "field");
           if (pair.searcher.getIndexReader().numDocs() > 0) {
@@ -239,8 +240,8 @@ public void testDirectory() throws Exception {
         SearcherAndTaxonomy pair = mgr.acquire();
         try {
           // System.out.println("search maxOrd=" + pair.taxonomyReader.getSize());
-          FacetsCollector sfc = new FacetsCollector();
-          pair.searcher.search(new MatchAllDocsQuery(), sfc);
+          FacetsCollector sfc =
+              pair.searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
           Facets facets = getTaxonomyFacetCounts(pair.taxonomyReader, config, sfc);
           FacetResult result = facets.getTopChildren(10, "field");
           if (pair.searcher.getIndexReader().numDocs() > 0) {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
index 41445dbb696a..43de8880adea 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
@@ -21,6 +21,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -96,10 +97,8 @@ public static void afterClass() throws Exception {
 
   public void testIntSumAssociation() throws Exception {
 
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher searcher = newSearcher(reader);
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = new TaxonomyFacetSumIntAssociations("$facets.int", taxoReader, config, fc);
     assertEquals(
@@ -112,10 +111,8 @@ public void testIntSumAssociation() throws Exception {
   }
 
   public void testFloatSumAssociation() throws Exception {
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher searcher = newSearcher(reader);
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = new TaxonomyFacetSumFloatAssociations("$facets.float", taxoReader, config, fc);
     assertEquals(
@@ -138,10 +135,8 @@ public void testFloatSumAssociation() throws Exception {
    * different field.
    */
   public void testIntAndFloatAssocation() throws Exception {
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher searcher = newSearcher(reader);
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = new TaxonomyFacetSumFloatAssociations("$facets.float", taxoReader, config, fc);
     assertEquals(
@@ -163,10 +158,8 @@ public void testIntAndFloatAssocation() throws Exception {
   }
 
   public void testWrongIndexFieldName() throws Exception {
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher searcher = newSearcher(reader);
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets = new TaxonomyFacetSumFloatAssociations(taxoReader, config, fc);
     expectThrows(
         IllegalArgumentException.class,
@@ -244,12 +237,10 @@ public void testRequireDimCount() throws Exception {
   }
 
   public void testIntSumAssociationDrillDown() throws Exception {
-    FacetsCollector fc = new FacetsCollector();
-
     IndexSearcher searcher = newSearcher(reader);
     DrillDownQuery q = new DrillDownQuery(config);
     q.add("int", "b");
-    searcher.search(q, fc);
+    FacetsCollector fc = searcher.search(q, new FacetsCollectorManager());
 
     Facets facets = new TaxonomyFacetSumIntAssociations("$facets.int", taxoReader, config, fc);
     assertEquals(
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
index 82a1be52c744..3b6bbb9976e6 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
@@ -35,6 +35,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.LabelAndValue;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
@@ -122,8 +123,7 @@ public void testBasic() throws Exception {
     // Now user drills down on Publish Date/2010:
     DrillDownQuery q2 = new DrillDownQuery(config);
     q2.add("Publish Date", "2010");
-    FacetsCollector c = new FacetsCollector();
-    searcher.search(q2, c);
+    FacetsCollector c = searcher.search(q2, new FacetsCollectorManager());
     facets = new FastTaxonomyFacetCounts(taxoReader, config, c);
     assertEquals(
         "dim=Author path=[] value=2 childCount=2\n  Bob (1)\n  Lisa (1)\n",
@@ -231,8 +231,7 @@ public void testWrongIndexFieldName() throws Exception {
     // NRT open
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
 
-    FacetsCollector c = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), c);
+    FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     // Uses default $facets field:
     Facets facets = new FastTaxonomyFacetCounts(taxoReader, config, c);
@@ -559,8 +558,8 @@ public void testSeparateIndexedFields() throws Exception {
     DirectoryReader r = DirectoryReader.open(iw);
     DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
 
-    FacetsCollector sfc = new FacetsCollector();
-    newSearcher(r).search(new MatchAllDocsQuery(), sfc);
+    FacetsCollector sfc =
+        newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets1 = getTaxonomyFacetCounts(taxoReader, config, sfc);
     Facets facets2 = getTaxonomyFacetCounts(taxoReader, config, sfc, "$b");
     assertEquals(r.maxDoc(), facets1.getTopChildren(10, "a").value.intValue());
@@ -701,8 +700,7 @@ public void testSegmentsWithoutCategoriesOrResults() throws Exception {
 
     // search for "f:a", only segments 1 and 3 should match results
     Query q = new TermQuery(new Term("f", "a"));
-    FacetsCollector sfc = new FacetsCollector();
-    indexSearcher.search(q, sfc);
+    FacetsCollector sfc = indexSearcher.search(q, new FacetsCollectorManager());
     Facets facets = getTaxonomyFacetCounts(taxoReader, config, sfc);
     FacetResult result = facets.getTopChildren(10, "A");
     assertEquals("wrong number of children", 2, result.labelValues.length);
@@ -860,14 +858,11 @@ private static Facets getAllFacets(
       String indexFieldName, IndexSearcher searcher, TaxonomyReader taxoReader, FacetsConfig config)
       throws IOException {
     if (random().nextBoolean()) {
-      // Aggregate the facet counts:
-      FacetsCollector c = new FacetsCollector();
-
       // MatchAllDocsQuery is for "browsing" (counts facets
       // for all non-deleted docs in the index); normally
       // you'd use a "normal" query, and use MultiCollector to
       // wrap collecting the "normal" hits and also facets:
-      searcher.search(new MatchAllDocsQuery(), c);
+      FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
       return new FastTaxonomyFacetCounts(taxoReader, config, c);
     } else {
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
index 0b94272c46a9..90b08d9120c1 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
@@ -32,6 +32,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.LabelAndValue;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
@@ -274,9 +275,8 @@ public void testDifferentNumResults() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
     IndexSearcher searcher = newSearcher(indexReader);
 
-    FacetsCollector sfc = new FacetsCollector();
     TermQuery q = new TermQuery(A);
-    searcher.search(q, sfc);
+    FacetsCollector sfc = searcher.search(q, new FacetsCollectorManager());
     Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
     FacetResult result = facets.getTopChildren(NUM_CHILDREN_CP_A, CP_A);
     assertEquals(-1, result.value.intValue());
@@ -298,8 +298,7 @@ public void testAllCounts() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
     IndexSearcher searcher = newSearcher(indexReader);
 
-    FacetsCollector sfc = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), sfc);
+    FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
 
@@ -340,8 +339,7 @@ public void testBigNumResults() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
     IndexSearcher searcher = newSearcher(indexReader);
 
-    FacetsCollector sfc = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), sfc);
+    FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
 
@@ -365,8 +363,7 @@ public void testNoParents() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
     IndexSearcher searcher = newSearcher(indexReader);
 
-    FacetsCollector sfc = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), sfc);
+    FacetsCollector sfc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
 
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java
index 3b510b9157eb..cdc583eaa4e4 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java
@@ -27,6 +27,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.FacetsCollector;
 import org.apache.lucene.facet.FacetsCollector.MatchingDocs;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -148,8 +149,7 @@ public void testBasic() throws Exception {
     // NRT open
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
 
-    FacetsCollector fc = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), fc);
+    FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     TaxonomyFacetLabels taxoLabels =
         new TaxonomyFacetLabels(taxoReader, FacetsConfig.DEFAULT_INDEX_FIELD_NAME);
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
index 654a95bc2b21..211320d12aa3 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
@@ -30,6 +30,7 @@
 import org.apache.lucene.facet.FacetTestCase;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.LabelAndValue;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
@@ -104,14 +105,11 @@ public void testBasic() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
     taxoWriter.close();
 
-    // Aggregate the facet counts:
-    FacetsCollector c = new FacetsCollector();
-
     // MatchAllDocsQuery is for "browsing" (counts facets
     // for all non-deleted docs in the index); normally
     // you'd use a "normal" query and one of the
     // Facets.search utility methods:
-    searcher.search(new MatchAllDocsQuery(), c);
+    FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     TaxonomyFacetSumValueSource facets =
         new TaxonomyFacetSumValueSource(
@@ -175,8 +173,7 @@ public void testSparseFacets() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
     taxoWriter.close();
 
-    FacetsCollector c = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), c);
+    FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     TaxonomyFacetSumValueSource facets =
         new TaxonomyFacetSumValueSource(
@@ -226,8 +223,7 @@ public void testWrongIndexFieldName() throws Exception {
     TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
     taxoWriter.close();
 
-    FacetsCollector c = new FacetsCollector();
-    searcher.search(new MatchAllDocsQuery(), c);
+    FacetsCollector c = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
 
     TaxonomyFacetSumValueSource facets =
         new TaxonomyFacetSumValueSource(
@@ -305,8 +301,8 @@ public void testNoScore() throws Exception {
     DirectoryReader r = DirectoryReader.open(iw);
     DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
 
-    FacetsCollector sfc = new FacetsCollector();
-    newSearcher(r).search(new MatchAllDocsQuery(), sfc);
+    FacetsCollector sfc =
+        newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets =
         new TaxonomyFacetSumValueSource(
             taxoReader, config, sfc, DoubleValuesSource.fromLongField("price"));
@@ -372,8 +368,8 @@ public void testRollupValues() throws Exception {
     DirectoryReader r = DirectoryReader.open(iw);
     DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
 
-    FacetsCollector sfc = new FacetsCollector();
-    newSearcher(r).search(new MatchAllDocsQuery(), sfc);
+    FacetsCollector sfc =
+        newSearcher(r).search(new MatchAllDocsQuery(), new FacetsCollectorManager());
     Facets facets =
         new TaxonomyFacetSumValueSource(
             taxoReader, config, sfc, DoubleValuesSource.fromLongField("price"));
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
index ce8dae507412..ffd56dc4667d 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
@@ -30,6 +30,7 @@
 import org.apache.lucene.facet.FacetField;
 import org.apache.lucene.facet.Facets;
 import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.FacetsCollectorManager;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.facet.taxonomy.FastTaxonomyFacetCounts;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
@@ -109,8 +110,7 @@ public Boolean call() throws Exception {
         // verify faceted search
         int id = Integer.parseInt(indexReader.getIndexCommit().getUserData().get(VERSION_ID), 16);
         IndexSearcher searcher = new IndexSearcher(indexReader);
-        FacetsCollector fc = new FacetsCollector();
-        searcher.search(new MatchAllDocsQuery(), fc);
+        FacetsCollector fc = searcher.search(new MatchAllDocsQuery(), new FacetsCollectorManager());
         Facets facets = new FastTaxonomyFacetCounts(taxoReader, config, fc);
         assertEquals(1, facets.getSpecificValue("A", Integer.toString(id, 16)).intValue());
 
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java
index ac793b9e4bab..88ea3e8d457c 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java
@@ -1955,7 +1955,7 @@ public static IndexSearcher newSearcher(IndexReader r, boolean maybeWrap) {
    */
   public static IndexSearcher newSearcher(
       IndexReader r, boolean maybeWrap, boolean wrapWithAssertions) {
-    return newSearcher(r, maybeWrap, wrapWithAssertions, rarely());
+    return newSearcher(r, maybeWrap, wrapWithAssertions, true);//TODO revert
   }
 
   /**