--- old/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java	2016-03-28 16:44:47.669059873 +0200
+++ new/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java	2016-03-28 16:44:47.580061414 +0200
@@ -63,8 +63,8 @@
      * @param cleaner  the {@code Cleaner} to register with
      */
     public PhantomCleanable(T referent, Cleaner cleaner) {
-        super(Objects.requireNonNull(referent), CleanerImpl.getCleanerImpl(cleaner).queue);
-        this.list = CleanerImpl.getCleanerImpl(cleaner).phantomCleanableList;
+        super(Objects.requireNonNull(referent), ((CleanerImpl)cleaner).queue());
+        this.list = ((CleanerImpl)cleaner).phantomCleanableList();
         insert();
 
         // Ensure referent and cleaner remain accessible