diff --git a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
index b502586ef..2d7daa05a 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
@@ -25,6 +25,8 @@ import net.openhft.chronicle.core.Maths;
 import net.openhft.chronicle.core.OS;
 import net.openhft.chronicle.hash.*;
 import net.openhft.chronicle.hash.impl.util.BuildVersion;
+import net.openhft.chronicle.hash.impl.util.Cleaner;
+import net.openhft.chronicle.hash.impl.util.CleanerUtils;
 import net.openhft.chronicle.hash.impl.util.jna.PosixMsync;
 import net.openhft.chronicle.hash.impl.util.jna.WindowsMsync;
 import net.openhft.chronicle.hash.serialization.DataAccess;
@@ -38,7 +40,6 @@ import net.openhft.chronicle.wire.Marshallable;
 import net.openhft.chronicle.wire.WireIn;
 import net.openhft.chronicle.wire.WireOut;
 import org.jetbrains.annotations.NotNull;
-import sun.misc.Cleaner;
 
 import java.io.Closeable;
 import java.io.File;
@@ -465,7 +466,7 @@ public abstract class VanillaChronicleHash<K,
     }
 
     public void registerCleaner() {
-        this.cleaner = Cleaner.create(this, resources);
+        this.cleaner = CleanerUtils.createCleaner(this, resources);
     }
 
     public void addToOnExitHook() {
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/util/Cleaner.java b/src/main/java/net/openhft/chronicle/hash/impl/util/Cleaner.java
new file mode 100644
index 000000000..608d22386
--- /dev/null
+++ b/src/main/java/net/openhft/chronicle/hash/impl/util/Cleaner.java
@@ -0,0 +1,7 @@
+package net.openhft.chronicle.hash.impl.util;
+
+public interface Cleaner {
+
+    void clean();
+
+}
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/util/CleanerUtils.java b/src/main/java/net/openhft/chronicle/hash/impl/util/CleanerUtils.java
new file mode 100644
index 000000000..bed09bd07
--- /dev/null
+++ b/src/main/java/net/openhft/chronicle/hash/impl/util/CleanerUtils.java
@@ -0,0 +1,45 @@
+package net.openhft.chronicle.hash.impl.util;
+
+import net.openhft.chronicle.core.Jvm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class CleanerUtils {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CleanerUtils.class);
+
+    private static final Method CREATE_METHOD;
+    private static final Method CLEAN_METHOD;
+
+    static {
+        try {
+            Class cleanerClass = Class.forName(Jvm.isJava9Plus() ? "jdk.internal.ref.Cleaner" : "sun.misc.Cleaner");
+            CREATE_METHOD = cleanerClass.getDeclaredMethod("create", Object.class, Runnable.class);
+            CLEAN_METHOD = cleanerClass.getDeclaredMethod("clean");
+        } catch (ClassNotFoundException | NoSuchMethodException e) {
+            LOGGER.error("Unable to initialise CleanerUtils", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Cleaner createCleaner(Object ob, Runnable thunk) {
+        try {
+            Object cleanerInstance = CREATE_METHOD.invoke(null, ob, thunk);
+            return () -> doClean(cleanerInstance);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            LOGGER.error("Unable to create cleaner", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void doClean(Object cleanerInstance) {
+        try {
+            CLEAN_METHOD.invoke(cleanerInstance);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            LOGGER.warn("Failed to clean buffer", e);
+        }
+    }
+}
diff --git a/src/test/java/net/openhft/chronicle/hash/impl/util/CleanerUtilsTest.java b/src/test/java/net/openhft/chronicle/hash/impl/util/CleanerUtilsTest.java
new file mode 100644
index 000000000..67a7082c9
--- /dev/null
+++ b/src/test/java/net/openhft/chronicle/hash/impl/util/CleanerUtilsTest.java
@@ -0,0 +1,23 @@
+package net.openhft.chronicle.hash.impl.util;
+
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertTrue;
+
+public class CleanerUtilsTest {
+
+    @Test
+    public void testClean() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        Object ob = new Object();
+        Cleaner cleaner = CleanerUtils.createCleaner(ob, latch::countDown);
+
+        cleaner.clean();
+
+        assertTrue(latch.await(1, TimeUnit.SECONDS));
+    }
+
+}
\ No newline at end of file