diff --git a/meta/main.yml b/meta/main.yml
index 765e90a..e9668c2 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -12,4 +12,5 @@
   galaxy_tags:
   - apigee
   - opdk
-dependencies: []
\ No newline at end of file
+dependencies:
+- { role: apigee-opdk-setup-default-settings }
diff --git a/tasks/main.yml b/tasks/main.yml
index 14c32ad..ba8c9da 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 # tasks file for apigee-opdk-setup-bootstrap
+#- block:
 - name: Download bootstrap
   bootstrap:
     dest_dir: '{{ opdk_installer_path }}'
@@ -9,6 +10,16 @@
     password: '{{ apigee_repo_password }}'
   register: results
 
+- name: Bootstrap script exists
+  stat:
+    path: '{{ bootstrap_script }}'
+  register: bootstrap_exists
+
+- name: Cache bootstrap script state
+  cache:
+    key: bootstrap_script_exists
+    value: '{{ bootstrap_exists.stat.exists }}'
+
 - name: Fail the playbook if bootstrap fails to install
   fail:
     msg: 'Bootstrap installation failed, no point in letting this go further'
@@ -21,7 +32,7 @@
   register: results
   env:
     JAVA_HOME: '{{ java_home }}'
-  failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+  failed_when: (results is defined and results.rc is defined) and results.rc > 0 or results | failed
   when: apigee_repo_host is not defined
 
 - name: Install bootstrap
@@ -43,3 +54,5 @@
     JAVA_HOME: '{{ java_home }}'
   failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
   when: apigee_repo_host is defined and apigee_stage is defined
+
+#  when: bootstrap_script_exists is defined and bootstrap_script_exists