diff --git a/.circleci/config.yml b/.circleci/config.yml
index 52bb45540..22aaf594a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,15 +44,15 @@ aliases:
 
   - &restore-cache-apt
     keys:
-      - v1-apt-{{ arch }}-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
-      # Fallback in case checksum fails
-      - v1-apt-{{ arch }}-{{ .Branch }}-
+      - v1-apt-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
       # Fallback in case this is a first-time run on a fork
-      - v1-apt-{{ arch }}-master-
+      # You always want to match checksum, if it fails,
+      # proceed with a fresh install.
+      - v1-apt-master-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
   - &save-cache-apt
     paths:
       - ~/vendor/apt
-    key: v1-apt-{{ arch }}-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
+    key: v1-apt-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
 
   - &restore-cache-ndk
     keys:
diff --git a/scripts/circleci/apt-get-android-deps.sh b/scripts/circleci/apt-get-android-deps.sh
index 6463de83d..8305f6244 100755
--- a/scripts/circleci/apt-get-android-deps.sh
+++ b/scripts/circleci/apt-get-android-deps.sh
@@ -22,4 +22,4 @@ fi
 
 # Install all packages in the cache
 echo "Installing build dependencies..."
-sudo dpkg -i ~/vendor/apt/archives/*.deb
\ No newline at end of file
+sudo dpkg -i ~/vendor/apt/archives/*.deb