diff --git a/src/cache.test.ts b/src/cli/output-cache.test.ts
similarity index 97%
rename from src/cache.test.ts
rename to src/cli/output-cache.test.ts
index 71a07b4c4..2f15c1e65 100644
--- a/src/cache.test.ts
+++ b/src/cli/output-cache.test.ts
@@ -4,14 +4,15 @@ import path from "path";
 
 import test from "ava";
 
+import { isVersionInfo } from "../codeql";
+import { setupTests } from "../testing-utils";
+
 import {
   cacheCommandOutput,
   getCachedCommandOutput,
   resetCachedCommandOutputs,
   CommandCacheKey,
-} from "./cache";
-import { isVersionInfo } from "./codeql";
-import { setupTests } from "./testing-utils";
+} from "./output-cache";
 
 setupTests(test);
 
diff --git a/src/cache.ts b/src/cli/output-cache.ts
similarity index 96%
rename from src/cache.ts
rename to src/cli/output-cache.ts
index 7ec0d6851..5af8a69c1 100644
--- a/src/cache.ts
+++ b/src/cli/output-cache.ts
@@ -1,9 +1,9 @@
 import * as fs from "fs";
 import * as path from "path";
 
-import { getTemporaryDirectory } from "./actions-util";
-import * as json from "./json";
-import { getActionsLogger } from "./logging";
+import { getTemporaryDirectory } from "../actions-util";
+import * as json from "../json";
+import { getActionsLogger } from "../logging";
 
 /**
  * The name of the temporary file that backs the on-disk cache of
diff --git a/src/codeql.ts b/src/codeql.ts
index 0a00cda61..f05147c68 100644
--- a/src/codeql.ts
+++ b/src/codeql.ts
@@ -16,7 +16,7 @@ import {
   cacheCommandOutput,
   getCachedCommandOutput,
   CommandCacheKey,
-} from "./cache";
+} from "./cli/output-cache";
 import { CliError, wrapCliConfigurationError } from "./cli-errors";
 import { appendExtraQueryExclusions, type Config } from "./config-utils";
 import { DocUrl } from "./doc-url";
diff --git a/src/init-action.ts b/src/init-action.ts
index dbcb2f054..a37da327d 100644
--- a/src/init-action.ts
+++ b/src/init-action.ts
@@ -19,12 +19,12 @@ import {
 } from "./actions-util";
 import { AnalysisKind, getAnalysisKinds } from "./analyses";
 import { getGitHubVersion, GitHubApiCombinedDetails } from "./api-client";
-import { writeCommandCacheFile } from "./cache";
 import {
   getDependencyCachingEnabled,
   getTotalCacheSize,
   shouldRestoreCache,
 } from "./caching-utils";
+import { writeCommandCacheFile } from "./cli/output-cache";
 import { CodeQL } from "./codeql";
 import { getConfigFileInput } from "./config/file";
 import * as configUtils from "./config-utils";
diff --git a/src/status-report.ts b/src/status-report.ts
index e6a489c5c..2d79b5307 100644
--- a/src/status-report.ts
+++ b/src/status-report.ts
@@ -12,7 +12,7 @@ import {
   isSelfHostedRunner,
 } from "./actions-util";
 import { getAnalysisKey, getApiClient } from "./api-client";
-import { getCachedCommandOutput, CommandCacheKey } from "./cache";
+import { getCachedCommandOutput, CommandCacheKey } from "./cli/output-cache";
 import { isVersionInfo } from "./codeql";
 import { parseRegistriesWithoutCredentials, type Config } from "./config-utils";
 import { DependencyCacheRestoreStatusReport } from "./dependency-caching";
diff --git a/src/testing-utils.ts b/src/testing-utils.ts
index b62242b26..d47f3be74 100644
--- a/src/testing-utils.ts
+++ b/src/testing-utils.ts
@@ -14,8 +14,8 @@ import { ActionsEnv, getActionVersion } from "./actions-util";
 import { AnalysisKind } from "./analyses";
 import * as apiClient from "./api-client";
 import { GitHubApiDetails } from "./api-client";
-import { resetCachedCommandOutputs } from "./cache";
 import { CachingKind } from "./caching-utils";
+import { resetCachedCommandOutputs } from "./cli/output-cache";
 import * as codeql from "./codeql";
 import { Config } from "./config-utils";
 import * as defaults from "./defaults.json";