diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 7a1669dde..9c13e7252 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -99,6 +99,7 @@ async function run() {
         // Possibly upload the database bundles for remote queries
         await (0, database_upload_1.uploadDatabases)(repositoryNwo, config, apiDetails, logger);
         // Possibly upload the TRAP caches for later re-use
+        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
         await (0, trap_caching_1.uploadTrapCaches)(codeql, config, logger);
         // We don't upload results in test mode, so don't wait for processing
         if (util.isInTestMode()) {
diff --git a/src/analyze-action.ts b/src/analyze-action.ts
index 937fdc480..1e28f2dda 100644
--- a/src/analyze-action.ts
+++ b/src/analyze-action.ts
@@ -162,6 +162,7 @@ async function run() {
     await uploadDatabases(repositoryNwo, config, apiDetails, logger);
 
     // Possibly upload the TRAP caches for later re-use
+    const codeql = await getCodeQL(config.codeQLCmd);
     await uploadTrapCaches(codeql, config, logger);
 
     // We don't upload results in test mode, so don't wait for processing