From 803f6f2e24a18f8377298cf5f1acb278c7fa2071 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Wed, 15 May 2024 07:50:51 +0200
Subject: [PATCH] fix: Use current class loader for the ByteBuddy wrapper

---
 src/main/java/io/appium/java_client/proxy/Helpers.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/appium/java_client/proxy/Helpers.java b/src/main/java/io/appium/java_client/proxy/Helpers.java
index af724ae43..d162c3ed5 100644
--- a/src/main/java/io/appium/java_client/proxy/Helpers.java
+++ b/src/main/java/io/appium/java_client/proxy/Helpers.java
@@ -136,7 +136,7 @@ public static <T> T createProxy(
                     .defineField("methodCallListeners", MethodCallListener[].class, Visibility.PRIVATE)
                     .implement(HasMethodCallListeners.class).intercept(FieldAccessor.ofBeanProperty())
                     .make()
-                    .load(ClassLoader.getSystemClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
+                    .load(Helpers.class.getClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
                     .getLoaded()
                     .asSubclass(cls);
         });