diff --git a/dist/index.js b/dist/index.js
index c0d53f46..60b19fc6 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -156849,6 +156849,8 @@ async function saveOpamCache() {
             "--download-cache",
             "--logs",
             "--repo-cache",
+            "--switch-cleanup",
+            "--untracked",
             "--unused-repositories",
         ]);
         const { key } = await composeOpamCacheKeys();
diff --git a/dist/post/index.js b/dist/post/index.js
index 28061fa7..74db7e0e 100644
--- a/dist/post/index.js
+++ b/dist/post/index.js
@@ -103092,6 +103092,8 @@ async function saveOpamCache() {
             "--download-cache",
             "--logs",
             "--repo-cache",
+            "--switch-cleanup",
+            "--untracked",
             "--unused-repositories",
         ]);
         const { key } = await composeOpamCacheKeys();
diff --git a/packages/setup-ocaml/src/cache.ts b/packages/setup-ocaml/src/cache.ts
index c5d10b20..e229b081 100644
--- a/packages/setup-ocaml/src/cache.ts
+++ b/packages/setup-ocaml/src/cache.ts
@@ -209,6 +209,8 @@ export async function saveOpamCache() {
       "--download-cache",
       "--logs",
       "--repo-cache",
+      "--switch-cleanup",
+      "--untracked",
       "--unused-repositories",
     ]);
     const { key } = await composeOpamCacheKeys();