diff --git a/Build/glass/cache_glass.yml b/Build/glass/cache_glass.yml
deleted file mode 100644
index d85357cfe1..0000000000
--- a/Build/glass/cache_glass.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-schedules:
-  - cron: "0 0 * * 0" # Runs at 00:00 UTC every Sunday
-    displayName: Weekly build
-    branches:
-      include:
-        - main
-    always: true
-
-steps:
-  - task: AzureCLI@2
-    displayName: 'Acquire an AAD token from a User-Assigned Managed Identity and save it as secret variable DropToken'
-    inputs:
-      azureSubscription: 'PylanceSecureVsIdePublishWithManagedIdentity'
-      scriptType: 'pscore'
-      scriptLocation: 'inlineScript'
-      inlineScript: |
-        # if this fails, check out this bash script that includes diagnostics:
-        # https://gist.github.com/johnterickson/19f80a3e969e39f1000d118739176e62
-        
-        # Note that the resoruce is specified to limit the token to Azure DevOps
-        $token = az account get-access-token --query accessToken --resource 499b84ac-1321-427f-aa17-267ca6975798 -o tsv
-        Write-Host "##vso[task.setvariable variable=DropToken;issecret=true]$token"      
-
-  # Setup the glass test folder
-  - task: PythonScript@0
-    displayName: 'Setup glass test folder'
-    env:
-      SYSTEM_ACCESSTOKEN: $(DropToken)
-    inputs:
-      scriptSource: 'filePath' # 'filePath' | 'inline'. Required. Script source. Default: filePath.
-      scriptPath: $(Build.SourcesDirectory)/Build/setup_glass.py
-      arguments: '--authTokenVariable SYSTEM_ACCESSTOKEN --buildOutput $(Build.BinariesDirectory)\raw\binaries'
-      workingDirectory: $(Build.SourcesDirectory)
-      failOnStderr: true
-      pythonInterpreter: $(PYTHON_INTERPRETER)
-
-  - task: CacheBeta@2
-    displayName: 'Cache glass binaries'
-    inputs:
-      key: 'glass'
-      path: '$(Build.BinariesDirectory)\raw\binaries'
diff --git a/Build/templates/run_tests.yml b/Build/templates/run_tests.yml
index d363f324b5..30b309ffdf 100644
--- a/Build/templates/run_tests.yml
+++ b/Build/templates/run_tests.yml
@@ -55,31 +55,50 @@ steps:
       configuration: $(BuildConfiguration)
       msbuildArguments: '/p:VSTarget=$(VSTarget) /bl:$(Build.SourcesDirectory)\logs\BuildProduct.binlog'
 
-  # Restore the glass binaries from cache
-  # - task: CacheBeta@2
-  #   displayName: 'Restore glass binaries from cache'
-  #   inputs:
-  #     key: 'glass'
-  #     path: '$(Build.BinariesDirectory)\raw\binaries'
-  #     cacheHitVar: 'CACHE_RESTORED'
+  - task: AzureCLI@2
+    displayName: 'Acquire an AAD token from a User-Assigned Managed Identity and save it as secret variable DropToken'
+    inputs:
+      azureSubscription: 'PylanceSecureVsIdePublishWithManagedIdentity'
+      scriptType: 'pscore'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        # if this fails, check out this bash script that includes diagnostics:
+        # https://gist.github.com/johnterickson/19f80a3e969e39f1000d118739176e62
+        
+        # Note that the resoruce is specified to limit the token to Azure DevOps
+        $token = az account get-access-token --query accessToken --resource 499b84ac-1321-427f-aa17-267ca6975798 -o tsv
+        Write-Host "##vso[task.setvariable variable=DropToken;issecret=true]$token"      
 
-  # # Run the glass tests
-  # - task: PythonScript@0
-  #   displayName: 'Run Glass tests'
-  #   inputs:
-  #     scriptSource: 'filePath' # 'filePath' | 'inline'. Required. Script source. Default: filePath.
-  #     scriptPath: $(Build.SourcesDirectory)/Build/run_glass.py
-  #     arguments: '--buildOutput $(Build.BinariesDirectory)\raw\binaries'
-  #     workingDirectory: $(Build.SourcesDirectory)
-  #     failOnStderr: true
-  #     pythonInterpreter: $(PYTHON_INTERPRETER)
+  # Setup the glass test folder
+  - task: PythonScript@0
+    displayName: 'Setup glass test folder'
+    env:
+      SYSTEM_ACCESSTOKEN: $(DropToken)
+    inputs:
+      scriptSource: 'filePath' # 'filePath' | 'inline'. Required. Script source. Default: filePath.
+      scriptPath: $(Build.SourcesDirectory)/Build/setup_glass.py
+      arguments: '--authTokenVariable SYSTEM_ACCESSTOKEN --buildOutput $(Build.BinariesDirectory)\raw\binaries'
+      workingDirectory: $(Build.SourcesDirectory)
+      failOnStderr: true
+      pythonInterpreter: $(PYTHON_INTERPRETER)
 
-  # # Upload the trx file as a test result
-  # - task: PublishTestResults@2
-  #   condition: always() # Always run this step, even if the previous step fails
-  #   displayName: 'Publish Glass test results'
-  #   inputs:
-  #     testResultsFiles: '$(Build.SourcesDirectory)/TestResults/*.trx'
-  #     testRunTitle: 'Glass Tests'
-  #     testResultsFormat: 'VSTest'
-  #     failTaskOnFailedTests: true
+  # Run the glass tests
+  - task: PythonScript@0
+    displayName: 'Run Glass tests'
+    inputs:
+      scriptSource: 'filePath' # 'filePath' | 'inline'. Required. Script source. Default: filePath.
+      scriptPath: $(Build.SourcesDirectory)/Build/run_glass.py
+      arguments: '--buildOutput $(Build.BinariesDirectory)\raw\binaries'
+      workingDirectory: $(Build.SourcesDirectory)
+      failOnStderr: true
+      pythonInterpreter: $(PYTHON_INTERPRETER)
+
+  # Upload the trx file as a test result
+  - task: PublishTestResults@2
+    condition: always() # Always run this step, even if the previous step fails
+    displayName: 'Publish Glass test results'
+    inputs:
+      testResultsFiles: '$(Build.SourcesDirectory)/TestResults/*.trx'
+      testRunTitle: 'Glass Tests'
+      testResultsFormat: 'VSTest'
+      failTaskOnFailedTests: true
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 77711fb4dd..df44e5edf6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -156,8 +156,6 @@ extends:
 
         # check out code clean from source control
         - checkout: self
-          fetchDepth: 1
-          fetchTags: false
           clean: true
 
         # Non-PR steps