diff --git a/defaults/main.yml b/defaults/main.yml
index a55f877..404f068 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,26 @@
 ---
 # defaults file for apigee-opdk-setup-bootstrap
 
+# Path to the Apigee archive
+apigeerepobasepath: '{{ apigee_home }}/data/apigee-mirror'
+
+# Apigee service command for 4.16.xx
+apigee_service: '{{ apigee_home }}/apigee-service/bin/apigee-service'
+
+# Apigee setup command for 4.16.xx
+apigee_setup: '{{ apigee_home }}/apigee-setup/bin/setup.sh'
+
+# Apigee update command for 4.16.xx
+apigee_update: '{{ apigee_home }}/apigee-setup/bin/update.sh'
+
+# Apigee all command for 4.16.xx
+apigee_all: '{{ apigee_home }}/apigee-service/bin/apigee-all'
+
+# Apigee staging installation folder
+opdk_installer_path: "/tmp/edge"
+
+# Apigee license file path
+opdk_license_target_file_path: "{{ opdk_installer_path }}/license.conf"
+
+# Apigee license file provided by customer
+opdk_license_source_file_name: '{{ local_apigee_secure }}/license.txt'
diff --git a/tasks/main.yml b/tasks/main.yml
index bd27093..227a079 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,18 @@
 ---
+- name: Update cache with key and value
+  cache:
+    key: "{{ item.key }}"
+    value: "{{ item.value }}"
+  with_items:
+  - { key: "apigeerepobasepath", value: "{{ apigeerepobasepath }}" }
+  - { key: 'apigee_service', value: '{{ apigee_service }}' }
+  - { key: 'apigee_setup', value: '{{ apigee_setup }}' }
+  - { key: 'apigee_update', value: '{{ apigee_update }}' }
+  - { key: 'apigee_all', value: '{{ apigee_all }}' }
+  - { key: 'opdk_installer_path', value: '{{ opdk_installer_path }}' }
+  - { key: 'opdk_license_target_file_path', value: "{{ opdk_license_target_file_path }}" }
+  - { key: 'opdk_license_source_file_name', value: "{{ opdk_license_source_file_name }}" }
+
 # tasks file for apigee-opdk-setup-bootstrap
 - name: Create installer path
   file:
@@ -15,7 +29,7 @@
 
 - name: Validate that apigee-service exists
   stat:
-    path: "{{ apigee_home }}/apigee-service/bin/apigee-service"
+    path: "{{ apigee_service }}"
   register: apigee_service
 
 - name: Fail if apigee-service is not installed