diff --git a/ci/azure-pipelines-linux.yml b/ci/azure-pipelines-linux.yml
index 82a770bdaef..6ae9076bed5 100644
--- a/ci/azure-pipelines-linux.yml
+++ b/ci/azure-pipelines-linux.yml
@@ -42,7 +42,7 @@ steps:
 # Cache the ${HOME}/.gmt directory, for docs and testing
 - task: Cache@2
   inputs:
-    key: cachedata | 20200814
+    key: cachedata | 20200820-3
     path: $(HOME)/.gmt
     cacheHitVar: CACHE_CACHEDATA_RESTORED
   displayName: Cache GMT remote data for testing
@@ -78,16 +78,10 @@ steps:
     gmt earthtide -T2018-06-18T12:00:00 -Gsolid_tide_up.grd
   displayName: Check a few simple commands
 
-# Download remote files, if not already cached
+# Download remote files, if not already cached [Linux agents always fail]
 - bash: |
     set -x -e
-    gmt get -Dcache
-    gmt which -Ga @earth_relief_30m @earth_relief_20m @earth_relief_15m \
-        @earth_relief_10m @earth_relief_10m_g @earth_relief_06m \
-        @earth_relief_05m_g @earth_relief_05m @earth_relief_04m \
-        @earth_relief_02m @earth_relief_01m
-    gmt which -Ga @earth_day_01d @earth_day_20m
-    gmt which -Ga @earth_night_20m
+    exit 1
   displayName: Download remote data
   condition: ne(variables['CACHE_CACHEDATA_RESTORED'], true)
 
diff --git a/ci/azure-pipelines-mac.yml b/ci/azure-pipelines-mac.yml
index e0dd9a171c5..f693e6e914c 100644
--- a/ci/azure-pipelines-mac.yml
+++ b/ci/azure-pipelines-mac.yml
@@ -41,7 +41,7 @@ steps:
 # Cache the ${HOME}/.gmt directory, for docs and testing
 - task: Cache@2
   inputs:
-    key: cachedata | 20200814
+    key: cachedata | 20200820-3
     path: $(HOME)/.gmt
     cacheHitVar: CACHE_CACHEDATA_RESTORED
   displayName: Cache GMT remote data for testing
@@ -80,13 +80,28 @@ steps:
 # Download remote files, if not already cached
 - bash: |
     set -x -e
+    # list of datasets used in tests
+    data="@earth_relief_01d \
+          @earth_relief_30m \
+          @earth_relief_20m \
+          @earth_relief_15m \
+          @earth_relief_10m @earth_relief_10m_g \
+          @earth_relief_06m \
+          @earth_relief_05m @earth_relief_05m_g \
+          @earth_relief_04m \
+          @earth_relief_02m
+          @earth_relief_01m \
+          @earth_day_01d \
+          @earth_day_20m \
+          @earth_night_20m \
+          @earth_age_06m \
+          @earth_mask_05m"
+    # Download remote data and cache files
+    # download remote data multiple times to make sure all are downloaded
+    gmt which -Ga $data
+    gmt which -Ga $data
+    gmt which -Ga $data
     gmt get -Dcache
-    gmt which -Ga @earth_relief_30m @earth_relief_20m @earth_relief_15m \
-        @earth_relief_10m @earth_relief_10m_g @earth_relief_06m \
-        @earth_relief_05m_g @earth_relief_05m @earth_relief_04m \
-        @earth_relief_02m @earth_relief_01m
-    gmt which -Ga @earth_day_01d @earth_day_20m
-    gmt which -Ga @earth_night_20m
   displayName: Download remote data
   condition: ne(variables['CACHE_CACHEDATA_RESTORED'], true)
 
diff --git a/ci/azure-pipelines-windows.yml b/ci/azure-pipelines-windows.yml
index a24fd1cafc9..259f1e82b13 100644
--- a/ci/azure-pipelines-windows.yml
+++ b/ci/azure-pipelines-windows.yml
@@ -105,7 +105,7 @@ steps:
 # Cache the ${HOME}/.gmt directory, for docs and testing
 - task: Cache@2
   inputs:
-    key: cachedata | 20200814
+    key: cachedata | 20200820-3
     path: $(HOMEPATH)/.gmt
     cacheHitVar: CACHE_CACHEDATA_RESTORED
   displayName: Cache GMT remote data for testing
@@ -139,16 +139,10 @@ steps:
     gmt earthtide -T2018-06-18T12:00:00 -Gsolid_tide_up.grd
   displayName: Check a few simple commands
 
-# Download remote files, if not already cached
+# Download remote files, if not already cached [Windows agents always fail]
 - bash: |
     set -x -e
-    gmt get -Dcache
-    gmt which -Ga @earth_relief_30m @earth_relief_20m @earth_relief_15m \
-        @earth_relief_10m @earth_relief_10m_g @earth_relief_06m \
-        @earth_relief_05m_g @earth_relief_05m @earth_relief_04m \
-        @earth_relief_02m @earth_relief_01m
-    gmt which -Ga @earth_day_01d @earth_day_20m
-    gmt which -Ga @earth_night_20m
+    exit 1
   displayName: Download remote data
   condition: ne(variables['CACHE_CACHEDATA_RESTORED'], true)