diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 91c91ad2c58..e12401398e3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -212,6 +212,9 @@ Other Changes
 * SOLR-8338: in OverseerTest replace strings such as "collection1" and "state" with variable
   or enum equivalent  (Christine Poerschke)
 
+* SOLR-8333: Several API tweaks so that public APIs were no longer refering to private classes
+  (ehatcher, Shawn Heisey, hossman)
+
 ==================  5.4.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
diff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java
index 2cb4e2e913e..a40f6375f59 100644
--- a/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java
+++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java
@@ -326,7 +326,7 @@ public class ConcurrentLFUCache<K, V> implements Cache<K,V> {
     return map;
   }
 
-  private static class CacheEntry<K, V> implements Comparable<CacheEntry<K, V>> {
+  public static class CacheEntry<K, V> implements Comparable<CacheEntry<K, V>> {
     K key;
     V value;
     volatile AtomicLong hits = new AtomicLong(0);
diff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
index 2f125a9760a..4c5a86dc9d9 100644
--- a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
+++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
@@ -481,7 +481,7 @@ public class ConcurrentLRUCache<K,V> implements Cache<K,V> {
     return map;
   }
 
-  private static class CacheEntry<K,V> implements Comparable<CacheEntry<K,V>> {
+  public static class CacheEntry<K,V> implements Comparable<CacheEntry<K,V>> {
     K key;
     V value;
     volatile long lastAccessed = 0;
diff --git a/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java b/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java
index c364afae594..26d8d02e7b6 100644
--- a/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java
+++ b/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java
@@ -21,7 +21,7 @@ package org.apache.solr.util.hll;
  * A serialization schema for HLLs. Reads and writes HLL metadata to
  * and from <code>byte[]</code> representations.
  */
-interface ISchemaVersion {
+public interface ISchemaVersion {
     /**
      * The number of metadata bytes required for a serialized HLL of the
      * specified type.