diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 2d59f404428e87..f130eff5d17af1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -876,6 +876,7 @@ public void notifyCommandComplete(ExtendedEventHandler eventHandler) throws Inte
     memoizingEvaluator.noteEvaluationsAtSameVersionMayBeFinished(eventHandler);
     progressReceiver.globDeps = new ConcurrentHashMap<>();
     globFunction.complete();
+    clearSyscallCache();
   }
 
   /**
@@ -1349,7 +1350,6 @@ public void preparePackageLoading(
         starlarkSemantics.getBool(BuildLanguageOptions.EXPERIMENTAL_SIBLING_REPOSITORY_LAYOUT));
     setPackageLocator(pkgLocator);
 
-    clearSyscallCache();
     this.pkgFactory.setGlobbingThreads(executors.globbingParallelism());
     this.pkgFactory.setMaxDirectoriesToEagerlyVisitInGlobbing(
         packageOptions.maxDirectoriesToEagerlyVisitInGlobbing);