diff --git a/codestyle/spotbugs-exclude.xml b/codestyle/spotbugs-exclude.xml
index 4fafbc4bbe3..e1fdbf71b05 100644
--- a/codestyle/spotbugs-exclude.xml
+++ b/codestyle/spotbugs-exclude.xml
@@ -55,7 +55,6 @@
     <Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/>
     <Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/>
     <Bug pattern="MS_FINAL_PKGPROTECT"/>
-    <Bug pattern="MS_OOI_PKGPROTECT"/>
     <Bug pattern="MS_PKGPROTECT"/>
     <Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT"/>
     <Bug pattern="NP_GUARANTEED_DEREF"/>
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
index 4ab4099cb92..39ab2c85a05 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
@@ -23,6 +23,8 @@ package org.apache.druid.query.metadata.metadata;
  */
 public class AllColumnIncluderator implements ColumnIncluderator
 {
+  private static final byte[] ALL_CACHE_PREFIX = new byte[]{0x1};
+
   @Override
   public boolean include(String columnName)
   {
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
index 7f55474b7e5..600b2773d2e 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
@@ -32,10 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 })
 public interface ColumnIncluderator
 {
-  byte[] NONE_CACHE_PREFIX = new byte[]{0x0};
-  byte[] ALL_CACHE_PREFIX = new byte[]{0x1};
-  byte[] LIST_CACHE_PREFIX = new byte[]{0x2};
-
   boolean include(String columnName);
   byte[] getCacheKey();
 }
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
index b1a336c3a40..22fefe3be14 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
@@ -34,6 +34,8 @@ import java.util.TreeSet;
  */
 public class ListColumnIncluderator implements ColumnIncluderator
 {
+  private static final byte[] LIST_CACHE_PREFIX = new byte[]{0x2};
+
   private final Set<String> columns;
 
   @JsonCreator
@@ -61,7 +63,7 @@ public class ListColumnIncluderator implements ColumnIncluderator
   public byte[] getCacheKey()
   {
     int size = 1;
-    List<byte[]> columns = Lists.newArrayListWithExpectedSize(this.columns.size());
+    final List<byte[]> columns = Lists.newArrayListWithExpectedSize(this.columns.size());
 
     for (String column : this.columns) {
       final byte[] bytes = StringUtils.toUtf8(column);
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
index b72f0242f04..69512a67e40 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
@@ -23,6 +23,8 @@ package org.apache.druid.query.metadata.metadata;
  */
 public class NoneColumnIncluderator implements ColumnIncluderator
 {
+  private static final byte[] NONE_CACHE_PREFIX = new byte[]{0x0};
+
   @Override
   public boolean include(String columnName)
   {