killbill-aplcache

diff --git a/payment/src/main/java/org/killbill/billing/payment/dispatcher/CallableWithRequestData.java b/payment/src/main/java/org/killbill/billing/payment/dispatcher/CallableWithRequestData.java
index 2890c6a..258c365 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dispatcher/CallableWithRequestData.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dispatcher/CallableWithRequestData.java
@@ -72,8 +72,7 @@ public class CallableWithRequestData<T> implements Callable<T> {
             UUIDs.setRandom(null);
             ThreadContext.unbindSecurityManager();
             ThreadContext.unbindSubject();
-            // Reset the MDC as before the call, in case the plugin fiddle'd with it
-            MDC.setContextMap(mdcContextMap);
+            MDC.clear();
         }
     }
 }