diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
index 14406ecf7e96..d757dbb23978 100644
--- a/.azure-pipelines/pipelines.yml
+++ b/.azure-pipelines/pipelines.yml
@@ -47,7 +47,7 @@ variables:
 - name: cacheKeyName
   value: envoy
 - name: cacheKeyVersion
-  value: v0
+  value: v1
 - name: cacheKeyBazel
   value: '.bazelversion | ./WORKSPACE | **/*.bzl, !mobile/**, !envoy-docs/**'
 - name: cacheKeyDocker
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index d33a3685ca25..8d043bb8f79d 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -548,9 +548,12 @@ case $CI_TARGET in
                   "${FETCH_TARGETS[@]}" \
                 && break
             n=$((n+1))
-            if [[ "$n" -ne 10 ]]; then
+            if [[ "$n" -lt 10 ]]; then
                 sleep 15
                 echo "Retrying fetch ..."
+            else
+                echo "Fetch failed"
+                exit 1
             fi
         done
         ;;