diff --git a/.ci/build-platform.yml b/.ci/build-platform.yml
index 3101540b..757c7514 100644
--- a/.ci/build-platform.yml
+++ b/.ci/build-platform.yml
@@ -1,10 +1,8 @@
 parameters:
   platform: "macOS"
   vmImage: "macOS-10.13"
-  STAGING_DIRECTORY: /Users/vsts/STAGING
-  STAGING_DIRECTORY_UNIX: /Users/vsts/STAGING
-  ESY__CACHE_INSTALL_PATH: /Users/vsts/.esy/3____________________________________________________________________/i
-  ESY__CACHE_SOURCE_TARBALL_PATH: /Users/vsts/.esy/source/i
+  STAGING_DIRECTORY: $(Build.StagingDirectory)
+  STAGING_DIRECTORY_UNIX: $(Build.StagingDirectory)
 
 jobs:
   - job: ${{ parameters.platform }}
@@ -15,12 +13,21 @@ jobs:
     variables:
       STAGING_DIRECTORY: ${{ parameters.STAGING_DIRECTORY }}
       STAGING_DIRECTORY_UNIX: ${{ parameters.STAGING_DIRECTORY_UNIX }}
-      ESY__CACHE_INSTALL_PATH: ${{ parameters.ESY__CACHE_INSTALL_PATH }}
-      ESY__CACHE_SOURCE_TARBALL_PATH: ${{ parameters.ESY__CACHE_SOURCE_TARBALL_PATH }}
-
     steps: 
-      - bash: echo "$(System.PullRequest.TargetBranch) - $SYSTEM_PULLREQUEST_TARGETBRANCH"
-        displayName: "Print CI_CACHE_BRANCH_NAME variable"
+      # reate a variable
+      - bash: |
+          # Desired length of path with underscores
+          DESIRED_LEN="86"
+          HOME_ESY3="$HOME/.esy/3"
+          HOME_ESY3_LEN=${#HOME_ESY3}
+          NUM_UNDERS=$(echo "$(($DESIRED_LEN-$HOME_ESY3_LEN))")
+          UNDERS="$(seq -s_ ${NUM_UNDERS}|tr -d '[:digit:]')"
+          THE_ESY__CACHE_INSTALL_PATH=${HOME_ESY3}${UNDERS}/i
+          # This will be exposed as an env var ESY__CACHE_INSTALL_PATH, or an
+          # Azure var esy__cache_install_path
+          echo "##vso[task.setvariable variable=esy__cache_install_path]$THE_ESY__CACHE_INSTALL_PATH"
+      - bash: echo Publishing Build Cache From $(esy__cache_install_path)
+        displayName: 'Debugging ESY__CACHE_INSTALL_PATH var'
       - bash: env
         displayName: "Print environment"
       - template: utils/use-node.yml
diff --git a/.ci/utils/publish-build-cache.yml b/.ci/utils/publish-build-cache.yml
index f63285c2..ff7ea2fe 100644
--- a/.ci/utils/publish-build-cache.yml
+++ b/.ci/utils/publish-build-cache.yml
@@ -5,7 +5,7 @@ steps:
     condition: and(succeeded(), eq(variables['Build.Reason'], 'IndividualCI'))
     displayName: '[Cache][Publish] Create cache directory'
 
-  - bash: 'cd $(ESY__CACHE_INSTALL_PATH) && tar -czf $(STAGING_DIRECTORY_UNIX)/esy-cache.tar .'
+  - bash: cd $ESY__CACHE_INSTALL_PATH && tar -czf $(STAGING_DIRECTORY_UNIX)/esy-cache.tar .
     workingDirectory: ''
     condition: and(succeeded(), eq(variables['Build.Reason'], 'IndividualCI'))
     displayName: '[Cache][Publish] Tar esy cache directory'
diff --git a/.ci/utils/restore-build-cache.yml b/.ci/utils/restore-build-cache.yml
index b11f3abe..249856e6 100644
--- a/.ci/utils/restore-build-cache.yml
+++ b/.ci/utils/restore-build-cache.yml
@@ -46,8 +46,10 @@ steps:
             echo "Build log for build that produced the cache: $LATEST_BUILD_PAGE"
             echo "Build badge for build that produced the cache: $LATEST_BUILD_BADGE"
             echo "Build artifact from build that produced the cache: $LATEST_ART_URL"
-            mkdir -p "$ESY__CACHE_INSTALL_PATH"
-            cd "${ESY__CACHE_INSTALL_PATH}" && tar -xf "${STAGING_DIRECTORY_UNIX}/cache-${AGENT_OS}-install/esy-cache.tar" -C .
+            echo "Restoring build cache into:"
+            echo $ESY__CACHE_INSTALL_PATH
+            mkdir -p $ESY__CACHE_INSTALL_PATH
+            cd $ESY__CACHE_INSTALL_PATH && tar -xf "${STAGING_DIRECTORY_UNIX}/cache-${AGENT_OS}-install/esy-cache.tar" -C .
           fi
         }
         fetchArtifactURL