diff --git a/backup.yml b/backup.yml
index d65bd9e..1768ef5 100644
--- a/backup.yml
+++ b/backup.yml
@@ -1,9 +1,9 @@
 ---
-- include: configuration/load-opdk-credentials.yml
+- include: configuration/update_cache.yml
   vars:
     hosts: 'planet'
   tags:
-  - credentials
+  - cache
 
 - include: components/opdk-backup.yml
   vars:
diff --git a/components/opdk-backup.yml b/components/opdk-backup.yml
index c699930..2320251 100644
--- a/components/opdk-backup.yml
+++ b/components/opdk-backup.yml
@@ -5,5 +5,4 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-backup, component_profile: '{{ component_name }}' }
diff --git a/configuration/load-opdk-credentials.yml b/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/configuration/load-opdk-credentials.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  become: yes
-  gather_facts: no
-  strategy: free
-  tasks:
-  - name: Load credentials from file
-    include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/configuration/update_cache.yml b/configuration/update_cache.yml
new file mode 100644
index 0000000..50bc4fb
--- /dev/null
+++ b/configuration/update_cache.yml
@@ -0,0 +1,13 @@
+---
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  pre_tasks:
+  - setup:
+
+  - ec2_facts:
+    when: "{{ ansible_bios_version | lower | search('amazon') }}"
+
+  roles:
+  - apigee-opdk-setup-default-settings
+