diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java b/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
index 4329fa4..36c17b4 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
@@ -38,7 +38,8 @@
 
     private static final Logger log = LoggerFactory.getLogger(ThreadsafeMockAdapterManagerWrapper.class);
 
-    private static final ThreadLocal<AdapterManagerBundleContextFactory> THREAD_LOCAL = new ThreadLocal<AdapterManagerBundleContextFactory>() {
+    private static final InheritableThreadLocal<AdapterManagerBundleContextFactory> THREAD_LOCAL =
+            new InheritableThreadLocal<AdapterManagerBundleContextFactory>() {
         @Override
         protected AdapterManagerBundleContextFactory initialValue() {
             return new AdapterManagerBundleContextFactory();