diff --git a/configuration/update_cache.yml b/configuration/update_cache.yml
deleted file mode 100644
index afe1ecc..0000000
--- a/configuration/update_cache.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: planet
-  strategy: free
-  gather_facts: no
-  vars_files:
-  - ~/.apigee/credentials.yml
-  pre_tasks:
-  - setup:
-  - ec2_facts:
-    when: "{{ ansible_bios_version | lower | search('amazon') }}"
-  roles:
-  - apigee-opdk-setup-default-settings
-
diff --git a/requirements.yml b/requirements.yml
index e9b6cf2..24da4f6 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -28,3 +28,5 @@
 - src: https://github.com/carlosfrias/apigee-opdk-iptables-flush
 
 - src: https://github.com/carlosfrias/apigee-opdk-iptables-port-block
+
+- src: https://github.com/carlosfrias/apigee-opdk-cache-update.git
diff --git a/upgrade.yml b/upgrade.yml
index caafb90..94e7fbe 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -1,8 +1,11 @@
 ---
-- name: Update Ansible cache
-  include: configuration/update_cache.yml
-  tags:
-  - cache
+- name: Update the ansible cache
+  hosts: planet
+  tags: ['cache']
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
 
 - name: All components should be running
   gather_facts: no