diff --git a/dist/setup/index.js b/dist/setup/index.js
index b9bd4ed..a21c079 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -88395,17 +88395,27 @@ function cacheWindowsDir(extPath, tool, version, arch) {
         const actualCacheDirectoryPaths = cacheDirectoryPaths.map(path => {
             return {
                 defaultPath: path,
-                actualPath: path.replace('D:', 'C:').replace('d:', 'c:')
+                actualPath: path.replace('C:', 'D:').replace('c:', 'd:')
             };
         });
-        // iterate through actual cache directory paths and make links
+        // iterate through actual cache directory paths and make links if necessary
         for (const cachePath of actualCacheDirectoryPaths) {
             if (!fs_1.default.existsSync(cachePath.actualPath)) {
                 core.info(`Creating directory ${cachePath.actualPath}`);
                 fs_1.default.mkdirSync(path.dirname(cachePath.actualPath), { recursive: true });
             }
-            fs_1.default.symlinkSync(cachePath.actualPath, cachePath.defaultPath, 'junction');
-            core.info(`Created link ${cachePath.defaultPath} => ${cachePath.actualPath}`);
+            else {
+                core.info(`Directory ${cachePath.actualPath} already exists`);
+                // make sure the link is pointing to the actual cache directory
+                const symlinkTarget = fs_1.default.readlinkSync(cachePath.defaultPath);
+                if (symlinkTarget !== "") {
+                    core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`);
+                }
+                else {
+                    fs_1.default.symlinkSync(cachePath.actualPath, cachePath.defaultPath, 'junction');
+                    core.info(`Created link ${cachePath.defaultPath} => ${cachePath.actualPath}`);
+                }
+            }
         }
         // make outer code to continue using toolcache as if it were installed on c:
         // restore toolcache root to default drive c:
diff --git a/src/installer.ts b/src/installer.ts
index 1fada71..dc66e01 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -240,7 +240,7 @@ async function cacheWindowsDir(
     } else {
       core.info(`Directory ${cachePath.actualPath} already exists`);
       // make sure the link is pointing to the actual cache directory
-      let symlinkTarget = fs.readlinkSync(cachePath.defaultPath);
+      const symlinkTarget = fs.readlinkSync(cachePath.defaultPath);
       if (symlinkTarget !== "") {
         core.info(`Found link ${cachePath.defaultPath} => ${symlinkTarget}`);
       } else {