diff --git a/src/main/java/org/dataloader/DataLoaderHelper.java b/src/main/java/org/dataloader/DataLoaderHelper.java index fab4f9b..8f8f08f 100644 --- a/src/main/java/org/dataloader/DataLoaderHelper.java +++ b/src/main/java/org/dataloader/DataLoaderHelper.java @@ -311,8 +311,10 @@ private CompletableFuture loadFromCache(K key, Object loadContext, boolean ba if (getCallEx == null) { future.complete(cachedValue); } else { - queueOrInvokeLoader(key, loadContext, batchingEnabled) - .whenComplete(setValueIntoCacheAndCompleteFuture(cacheKey, future)); + synchronized (dataLoader) { + queueOrInvokeLoader(key, loadContext, batchingEnabled) + .whenComplete(setValueIntoCacheAndCompleteFuture(cacheKey, future)); + } } });