diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
index 3f738d755b6..9b338794f77 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
@@ -83,25 +83,22 @@
          that match a particular query.
       -->
     <filterCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <queryResultCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <documentCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="0"/>
 
     <cache name="perSegFilter"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="0"
            autowarmCount="10" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
index c6613e1cea1..6997eaff987 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
@@ -37,21 +37,18 @@
       -->
     <filterCache
       enabled="${filterCache.enabled}"
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="2"/>
 
     <queryResultCache
       enabled="${queryResultCache.enabled}"
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="2"/>
 
     <documentCache
       enabled="${documentCache.enabled}"
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
index 80884fe46f6..f7d941c6fae 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
@@ -21,19 +21,19 @@
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <query>
     <cache name="lfuCacheDecayFalse"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="9"
            timeDecay="false" />
 
     <cache name="lfuCacheDecayTrue"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="9"
            timeDecay="true" />
 
     <cache name="lfuCacheDecayDefault"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="9" />
   </query>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index f5d2dbac99e..89dbecb00e4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -83,25 +83,22 @@
          that match a particular query.
       -->
     <filterCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <queryResultCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <documentCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="0"/>
 
     <cache name="perSegFilter"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="0"
            autowarmCount="10" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
index 683c8a6f4ad..7100d25b109 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
@@ -39,8 +39,8 @@
   <!-- deep paging better play nice with caching -->
   <query>
     <!-- no wautowarming, it screws up our ability to sanity check cache stats in tests -->
-    <filterCache class="solr.CaffeineCache" size="50" initialSize="50" autowarmCount="0"/>
-    <queryResultCache class="solr.CaffeineCache" size="50" initialSize="50" autowarmCount="0"/>
+    <filterCache size="50" initialSize="50" autowarmCount="0"/>
+    <queryResultCache size="50" initialSize="50" autowarmCount="0"/>
     <queryResultWindowSize>50</queryResultWindowSize>
     <queryResultMaxDocsCached>500</queryResultMaxDocsCached>
     <!-- randomized so we excersize cursors using various paths in SolrIndexSearcher -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
index b23ad51c125..fcb0140fb80 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
@@ -41,19 +41,16 @@
 
   <query>
     <filterCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
 
     <queryResultCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
 
     <documentCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
index 61b471df47b..4123314c849 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
@@ -56,19 +56,16 @@
          that match a particular query.
       -->
     <filterCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="256"/>
 
     <queryResultCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="1024"/>
 
     <documentCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
index 2c26e5ad66f..46158cd77cf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
@@ -37,21 +37,18 @@
   <query>
     <filterCache
         enabled="${filterCache.enabled:false}"
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <queryResultCache
         enabled="${queryResultCache.enabled:false}"
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <documentCache
         enabled="${documentCache.enabled:false}"
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="0"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
index fa118f5c75c..7bced683b18 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
@@ -95,25 +95,22 @@
          that match a particular query.
       -->
     <filterCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="2"/>
 
     <queryResultCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="2"/>
 
     <documentCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
 
     <cache name="perSegFilter"
-      class="solr.search.CaffeineCache"
+      class="solr.CaffeineCache"
       size="10"
       initialSize="0"
       autowarmCount="10" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
index af1b3359ffc..87dc399989e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
@@ -82,25 +82,22 @@
          that match a particular query.
       -->
     <filterCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <queryResultCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="2"/>
 
     <documentCache
-        class="solr.search.CaffeineCache"
         size="512"
         initialSize="512"
         autowarmCount="0"/>
 
     <cache name="perSegFilter"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="0"
            autowarmCount="10" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
index 0ccb94225d0..1bb3c97a225 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
@@ -35,8 +35,7 @@
 
     <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
-    <documentCache class="solr.CaffeineCache"
-                   size="512"
+    <documentCache size="512"
                    initialSize="512"
                    autowarmCount="0"/>
   </query>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
index 3ba27426038..889d1c24968 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
@@ -39,4 +39,4 @@
            autowarmCount="100%"
            regenerator="solr.NoOpRegenerator"/>
   </query>
-</config>
\ No newline at end of file
+</config>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
index 6cc49921414..2fc3c522392 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
@@ -140,23 +140,23 @@
 
 
   <query>
-    <filterCache class="solr.CaffeineCache"
+    <filterCache
       size="512"
       initialSize="512"
       autowarmCount="0" />
 
-    <queryResultCache class="solr.CaffeineCache"
+    <queryResultCache
       size="512"
       initialSize="512"
       autowarmCount="0" />
 
-    <documentCache class="solr.CaffeineCache"
+    <documentCache
       size="512"
       initialSize="512"
       autowarmCount="0" />
 
     <cache name="perSegFilter"
-      class="solr.search.CaffeineCache"
+      class="solr.CaffeineCache"
       size="10"
       initialSize="0"
       autowarmCount="10"
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 0bebc3fe0ea..80dabf52bf1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -95,25 +95,22 @@
          that match a particular query.
       -->
     <filterCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="2"/>
 
     <queryResultCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="2"/>
 
     <documentCache
-      class="solr.search.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
 
     <cache name="perSegFilter"
-      class="solr.search.CaffeineCache"
+      class="solr.CaffeineCache"
       size="10"
       initialSize="0"
       autowarmCount="10" />
@@ -125,7 +122,6 @@
     <!--
 
     <cache name="myUserCache"
-      class="solr.search.CaffeineCache"
       size="4096"
       initialSize="1024"
       autowarmCount="1024"
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
index e6bf205256f..29fbd3d6f97 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
@@ -36,19 +36,16 @@
   
   <query>
     <filterCache
-      class="solr.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
 
     <queryResultCache
-      class="solr.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
 
     <documentCache
-      class="solr.CaffeineCache"
       size="512"
       initialSize="512"
       autowarmCount="0"/>
diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
index b02c2b277ca..548d2c53fee 100644
--- a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
@@ -404,8 +404,7 @@
                       to occupy. Note that when this option is specified, the size
                       and initialSize parameters are ignored.
       -->
-    <filterCache class="solr.CaffeineCache"
-                 size="512"
+    <filterCache size="512"
                  initialSize="512"
                  autowarmCount="0"/>
 
@@ -417,8 +416,7 @@
             maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
                        to occupy
       -->
-    <queryResultCache class="solr.CaffeineCache"
-                      size="512"
+    <queryResultCache size="512"
                       initialSize="512"
                       autowarmCount="0"/>
 
@@ -428,14 +426,13 @@
          document).  Since Lucene internal document ids are transient,
          this cache will not be autowarmed.
       -->
-    <documentCache class="solr.CaffeineCache"
-                   size="512"
+    <documentCache size="512"
                    initialSize="512"
                    autowarmCount="0"/>
 
     <!-- custom cache currently used by block join -->
     <cache name="perSegFilter"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="0"
            autowarmCount="10"
@@ -448,8 +445,7 @@
          even if not configured here.
       -->
     <!--
-       <fieldValueCache class="solr.CaffeineCache"
-                        size="512"
+       <fieldValueCache size="512"
                         autowarmCount="128"
                         showItems="32" />
       -->
diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
index 5eee7489c56..10c8fa76aa4 100644
--- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
@@ -56,19 +56,19 @@
   </updateHandler>
 
   <query>
-         <filterCache class="solr.CaffeineCache"
+         <filterCache
                  size="0"
                  initialSize="0"
                  autowarmCount="0"/>
-         <queryResultCache class="solr.CaffeineCache"
+         <queryResultCache
                   size="0"
                   initialSize="0"
                   autowarmCount="0"/>
-         <documentCache class="solr.CaffeineCache"
+         <documentCache
                    size="0"
                    initialSize="0"
                    autowarmCount="0"/>
-         <fieldValueCache class="solr.CaffeineCache"
+         <fieldValueCache
                 size="0"
                 autowarmCount="0"
                 showItems="0" />         
diff --git a/solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml
index b7a13796010..942e7f5db23 100644
--- a/solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml
@@ -26,17 +26,17 @@
   <requestHandler name="/select" class="solr.SearchHandler" />
 
   <query>
-    <filterCache class="solr.CaffeineCache"
+    <filterCache
       size="512"
       initialSize="512"
       autowarmCount="0" />
 
-    <queryResultCache class="solr.CaffeineCache"
+    <queryResultCache
       size="512"
       initialSize="512"
       autowarmCount="0" />
 
-    <documentCache class="solr.CaffeineCache"
+    <documentCache
       size="512"
       initialSize="512"
       autowarmCount="0" />
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index b02c2b277ca..548d2c53fee 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -404,8 +404,7 @@
                       to occupy. Note that when this option is specified, the size
                       and initialSize parameters are ignored.
       -->
-    <filterCache class="solr.CaffeineCache"
-                 size="512"
+    <filterCache size="512"
                  initialSize="512"
                  autowarmCount="0"/>
 
@@ -417,8 +416,7 @@
             maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
                        to occupy
       -->
-    <queryResultCache class="solr.CaffeineCache"
-                      size="512"
+    <queryResultCache size="512"
                       initialSize="512"
                       autowarmCount="0"/>
 
@@ -428,14 +426,13 @@
          document).  Since Lucene internal document ids are transient,
          this cache will not be autowarmed.
       -->
-    <documentCache class="solr.CaffeineCache"
-                   size="512"
+    <documentCache size="512"
                    initialSize="512"
                    autowarmCount="0"/>
 
     <!-- custom cache currently used by block join -->
     <cache name="perSegFilter"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="10"
            initialSize="0"
            autowarmCount="10"
@@ -448,8 +445,7 @@
          even if not configured here.
       -->
     <!--
-       <fieldValueCache class="solr.CaffeineCache"
-                        size="512"
+       <fieldValueCache size="512"
                         autowarmCount="128"
                         showItems="32" />
       -->
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 34e2873b5de..98f75950b25 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -428,8 +428,7 @@
                       to occupy. Note that when this option is specified, the size
                       and initialSize parameters are ignored.
       -->
-    <filterCache class="solr.CaffeineCache"
-                 size="512"
+    <filterCache size="512"
                  initialSize="512"
                  autowarmCount="0"/>
 
@@ -441,8 +440,7 @@
            maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
                       to occupy
      -->
-    <queryResultCache class="solr.CaffeineCache"
-                     size="512"
+    <queryResultCache size="512"
                      initialSize="512"
                      autowarmCount="0"/>
 
@@ -452,14 +450,13 @@
          document).  Since Lucene internal document ids are transient,
          this cache will not be autowarmed.
       -->
-    <documentCache class="solr.CaffeineCache"
-                   size="512"
+    <documentCache size="512"
                    initialSize="512"
                    autowarmCount="0"/>
 
     <!-- custom cache currently used by block join -->
     <cache name="perSegFilter"
-      class="solr.search.CaffeineCache"
+      class="solr.CaffeineCache"
       size="10"
       initialSize="0"
       autowarmCount="10"
@@ -472,8 +469,7 @@
          even if not configured here.
       -->
     <!--
-       <fieldValueCache class="solr.CaffeineCache"
-                        size="512"
+       <fieldValueCache size="512"
                         autowarmCount="128"
                         showItems="32" />
       -->
@@ -489,7 +485,7 @@
          https://lucene.apache.org/solr/guide/learning-to-rank.html
       -->
     <cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV"
-           class="solr.search.CaffeineCache"
+           class="solr.CaffeineCache"
            size="4096"
            initialSize="2048"
            autowarmCount="4096"