Revert Address review comments

packages/cache/src/cache.ts

@@ -97,12 +97,22 @@ export async function restoreCache(
         compressionMethod
       })
     } catch (error) {
-      cacheEntry = await cacheHttpClient.getCacheEntryForGzipFallbackOnWindows(
+      // This is to support the old cache entry created
-        keys,
+      // by the old version of the cache action on windows.
-        paths,
+      if (
-        compressionMethod,
+        process.platform === 'win32' &&
-        error
+        compressionMethod !== CompressionMethod.Gzip
-      )
+      ) {
+        compressionMethod = CompressionMethod.Gzip
+        cacheEntry = await cacheHttpClient.getCacheEntry(keys, paths, {
+          compressionMethod
+        })
+        if (!cacheEntry?.archiveLocation) {
+          throw error
+        }
+      } else {
+        throw error
+      }
     }
 
     if (!cacheEntry?.archiveLocation) {

packages/cache/src/internal/cacheHttpClient.ts

@@ -122,32 +122,6 @@ export async function getCacheEntry(
   return cacheResult
 }
 
-// This is to support the old cache entry created
-// by the old version of the cache action on windows.
-export async function getCacheEntryForGzipFallbackOnWindows(
-  keys: string[],
-  paths: string[],
-  compressionMethod: CompressionMethod,
-  error: unknown
-): Promise<ArtifactCacheEntry> {
-  let cacheEntry: ArtifactCacheEntry | null
-  if (
-    process.platform === 'win32' &&
-    compressionMethod !== CompressionMethod.Gzip
-  ) {
-    compressionMethod = CompressionMethod.Gzip
-    cacheEntry = await getCacheEntry(keys, paths, {
-      compressionMethod
-    })
-    if (!cacheEntry?.archiveLocation) {
-      throw error
-    }
-  } else {
-    throw error
-  }
-  return cacheEntry
-}
-
 export async function downloadCache(
   archiveLocation: string,
   archivePath: string,