--- old/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	2016-02-07 17:26:31.173007367 +0100
+++ new/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	2016-02-07 17:26:31.041009597 +0100
@@ -30,7 +30,7 @@
 import static java.lang.invoke.MethodHandleNatives.Constants.*;
 import static java.lang.invoke.MethodHandleStatics.*;
 import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
-import jdk.internal.ref.Cleaner;
+import jdk.internal.ref.CleanerFactory;
 
 /**
  * The JVM interface for the method handles package is all here.
@@ -71,7 +71,7 @@
             // Cleaner is attached to CallSite instance and it clears native structures allocated for CallSite context.
             // Though the CallSite can become unreachable, its Context is retained by the Cleaner instance (which is
             // referenced from Cleaner class) until cleanup is performed.
-            Cleaner.create(cs, newContext);
+            CleanerFactory.cleaner().register(cs, newContext);
             return newContext;
         }