diff --git a/app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java b/app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
index 14134fc38..3bc92a6c1 100644
--- a/app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
+++ b/app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
@@ -9,7 +9,11 @@ import dalvik.system.DexClassLoader;
 
 public class DynamicClassLoader extends DexClassLoader {
 
-    private ClassLoader base = Object.class.getClassLoader();
+    private static final ClassLoader base = Object.class.getClassLoader();
+
+    public DynamicClassLoader(File apk) {
+        super(apk.getPath(), apk.getParent(), null, base);
+    }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {
         super(apk.getPath(), apk.getParent(), null, parent);
@@ -18,7 +22,7 @@ public class DynamicClassLoader extends DexClassLoader {
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
         // First check if already loaded
-        Class cls = findLoadedClass(name);
+        Class<?> cls = findLoadedClass(name);
         if (cls != null)
             return cls;
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
index e136bd41b..9adbebcee 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
@@ -264,8 +264,7 @@ fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
 
 fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri())
 
-@Suppress("FunctionName")
-inline fun <reified T> T.DynamicClassLoader(apk: File) =
+inline fun <reified T> T.createClassLoader(apk: File) =
     DynamicClassLoader(apk, T::class.java.classLoader)
 
 fun Context.unwrap(): Context {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
index 2250c5072..f77e27668 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.arch.ContextExecutor
 import com.topjohnwu.magisk.arch.ViewEventWithScope
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.repository.NetworkService
-import com.topjohnwu.magisk.ktx.DynamicClassLoader
+import com.topjohnwu.magisk.ktx.createClassLoader
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.signing.CryptoUtils
@@ -67,7 +67,7 @@ class CheckSafetyNetEvent(
     private suspend fun attest(context: Context, onError: suspend (Exception) -> Unit) {
         val helper: SafetyNetHelper
         try {
-            val loader = DynamicClassLoader(apk)
+            val loader = createClassLoader(apk)
 
             // Scan through the dex and find our helper class
             var clazz: Class<*>? = null
diff --git a/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java b/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java
index 38b7ce2b4..512416b7e 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java
@@ -7,10 +7,7 @@ import java.io.File;
 class InjectedClassLoader extends DynamicClassLoader {
 
     InjectedClassLoader(File apk) {
-        super(apk,
-                /* Use the base classloader as we do not want stub
-                 * APK classes accessible from the main app */
-                Object.class.getClassLoader());
+        super(apk);
     }
 
     @Override