diff --git a/cwltool/command_line_tool.py b/cwltool/command_line_tool.py
index e201fb12b..775360016 100644
--- a/cwltool/command_line_tool.py
+++ b/cwltool/command_line_tool.py
@@ -807,10 +807,10 @@ def job(
             cachecontext.tmpdir = "/tmp"  # nosec
             cachecontext.stagedir = "/stage"
             cachebuilder = self._init_job(job_order, cachecontext)
-            cachebuilder.pathmapper = PathMapper(
+            cachebuilder.pathmapper = self.make_path_mapper(
                 cachebuilder.files,
-                runtimeContext.basedir,
                 cachebuilder.stagedir,
+                runtimeContext,
                 separateDirs=False,
             )
             _check_adjust = partial(check_adjust, self.path_check_mode.value, cachebuilder)