--- old/src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java	2016-04-02 12:53:00.316632102 +0200
+++ new/src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java	2016-04-02 12:53:00.225633679 +0200
@@ -63,8 +63,8 @@
      * @param cleaner  the {@code Cleaner} to register with
      */
     public SoftCleanable(T referent, Cleaner cleaner) {
-        super(Objects.requireNonNull(referent), CleanerImpl.getCleanerImpl(cleaner).queue);
-        list = CleanerImpl.getCleanerImpl(cleaner).softCleanableList;
+        super(Objects.requireNonNull(referent), ((CleanerImpl)cleaner).queue());
+        list = ((CleanerImpl)cleaner).softCleanableList();
         insert();
 
         // Ensure referent and cleaner remain accessible