diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
index 211827edc71..82d84c15812 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
@@ -24,8 +24,8 @@ import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
+import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.net.URL;
@@ -830,13 +830,14 @@ public class Utils {
     List<FieldWriter> fieldWriters = null;
     try {
       fieldWriters = getReflectData(o.getClass());
-    } catch (Exception e) {
+    } catch (IllegalAccessException e) {
       throw new RuntimeException(e);
     }
     for (FieldWriter fieldWriter : fieldWriters) {
       try {
         fieldWriter.write(ew, o);
-      } catch (IllegalAccessException e) {
+      } catch( Throwable e) {
+        throw new RuntimeException(e);
         //should not happen
       }
     }
@@ -857,19 +858,29 @@ public class Utils {
         int modifiers = field.getModifiers();
         if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers)) {
           String fname = prop.value().isEmpty() ? field.getName() : prop.value();
-          final VarHandle vhandle = lookup.unreflectVarHandle(field);
-          if (field.getType() == int.class) {
-            l.add((ew, inst) -> ew.put(fname, (int) vhandle.get(inst)));
-          } else if (field.getType() == long.class) {
-            l.add((ew, inst) -> ew.put(fname, (long) vhandle.get(inst)));
-          } else if (field.getType() == boolean.class) {
-            l.add((ew, inst) -> ew.put(fname, (boolean) vhandle.get(inst)));
-          } else if (field.getType() == double.class) {
-            l.add((ew, inst) -> ew.put(fname, (double) vhandle.get(inst)));
-          } else if (field.getType() == float.class) {
-            l.add((ew, inst) -> ew.put(fname, (float) vhandle.get(inst)));
-          } else {
-            l.add((ew, inst) -> ew.put(fname, vhandle.get(inst)));
+          try {
+            if (field.getType() == int.class) {
+              MethodHandle mh = lookup.findGetter(c, field.getName(), int.class);
+              l.add((ew, inst) -> ew.put(fname, (int) mh.invoke(inst)));
+            } else if (field.getType() == long.class) {
+              MethodHandle mh = lookup.findGetter(c, field.getName(), long.class);
+              l.add((ew, inst) -> ew.put(fname, (long) mh.invoke(inst)));
+            } else if (field.getType() == boolean.class) {
+              MethodHandle mh = lookup.findGetter(c, field.getName(), boolean.class);
+              l.add((ew, inst) -> ew.put(fname, (boolean) mh.invoke(inst)));
+            } else if (field.getType() == double.class) {
+              MethodHandle mh = lookup.findGetter(c, field.getName(), double.class);
+              l.add((ew, inst) -> ew.put(fname, (double) mh.invoke(inst)));
+            } else if (field.getType() == float.class) {
+              MethodHandle mh = lookup.findGetter(c, field.getName(), float.class);
+              l.add((ew, inst) -> ew.put(fname, (float) mh.invoke(inst)));
+            } else {
+              MethodHandle mh = lookup.findGetter(c, field.getName(), field.getType());
+              l.add((ew, inst) -> ew.put(fname, mh.invoke(inst)));
+            }
+          } catch (NoSuchFieldException e) {
+            //this is unlikely
+            throw new RuntimeException(e);
           }
         }}
 
@@ -883,10 +894,10 @@ public class Utils {
 
 
   @SuppressWarnings("rawtypes")
-  static Map<Class, List<FieldWriter>> storedReflectData =   new ConcurrentHashMap<>();
+  private static Map<Class, List<FieldWriter>> storedReflectData =   new ConcurrentHashMap<>();
 
   interface FieldWriter {
-    void write(MapWriter.EntryWriter ew, Object inst) throws IllegalAccessException, IOException;
+    void write(MapWriter.EntryWriter ew, Object inst) throws Throwable;
   }
 
 }
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestSolrJsonWriter.java b/solr/solrj/src/test/org/apache/solr/common/util/TestSolrJsonWriter.java
index b3d2a53db26..8672e64eb14 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/TestSolrJsonWriter.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestSolrJsonWriter.java
@@ -74,7 +74,8 @@ public class TestSolrJsonWriter  extends SolrTestCaseJ4 {
     System.out.println("JSON Map write time : "+write2String(map, iters));
 
     System.out.println("javabin REFLECT write time : "+write2Javabin(c1,iters));
-    System.out.println("javabin Map write time : "+write2Javabin(map, iters));*/
+    System.out.println("javabin Map write time : "+write2Javabin(map, iters));
+    */
 
   }
 
@@ -101,12 +102,12 @@ public class TestSolrJsonWriter  extends SolrTestCaseJ4 {
     }
     return System.currentTimeMillis()-start;
 
+//    JSON REFLECT write time : 76
+//    JSON Map write time : 42
+//    javabin REFLECT write time : 50
+//    javabin Map write time : 32
 //
-//    JSON REFLECT write time : 107
-//    JSON Map write time : 62
-//    javabin REFLECT write time : 48
-//    javabin Map write time : 34
-//
+//    before
 //    JSON REFLECT write time : 181
 //    JSON Map write time : 38
 //    javabin REFLECT write time : 111