diff --git a/defaults/main.yml b/defaults/main.yml
index c31d569..4f430d7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,8 @@
 ---
 # defaults file for apigee-opdk-setup-jdk
+
+# Target Java JDK version
+jdk_version: '1.8'
+
+# System file path to use in JAVA_HOME
+java_home: /usr/lib/jvm/java-openjdk
diff --git a/tasks/main.yml b/tasks/main.yml
index 94f3114..48c7cb2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,13 @@
 ---
-#- include: with_no_proxy.yml
-#  when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
-#
-#- include: with_proxy.yml
-#  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+- name: Update cache with key and value
+  tags: ['cache']
+  cache:
+    key: "{{ item.key }}"
+    value: "{{ item.value }}"
+  with_items:
+  - { key: "jdk_version", value: "{{ jdk_version }}" }
+  - { key: 'java_home', value: '{{ java_home }}' }
+
 - block:
 
   - name: Install Java JDK with proxy
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
deleted file mode 100644
index ee50e43..0000000
--- a/tasks/with_no_proxy.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- block:
-
-  - name: Install Java JDK with no proxy
-    become: yes
-    yum:
-      name: "java-{{ jdk_version }}.0-openjdk-devel.{{ ansible_architecture }}"
-      state: present
-      disable_gpg_check: yes
-
-  rescue:
-    - name: Install Java JDK with no proxy
-      become: yes
-      yum:
-        name: "java-{{ jdk_version }}.0-openjdk-devel"
-        disable_gpg_check: yes
-        state: present
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
deleted file mode 100644
index 2e0392c..0000000
--- a/tasks/with_proxy.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- block:
-
-  - name: Install Java JDK with proxy
-    become: yes
-    yum:
-      name: "java-{{ jdk_version }}.0-openjdk-devel.{{ ansible_architecture }}"
-      state: present
-      disable_gpg_check: yes
-    environment:
-      http_proxy: "{{ http_proxy }}"
-      https_proxy: "{{ https_proxy }}"
-      no_proxy: "{{ no_proxy }}"
-
-  rescue:
-    - name: Install Java JDK with proxy
-      become: yes
-      yum:
-        name: "java-{{ jdk_version }}.0-openjdk-devel"
-        state: present
-        disable_gpg_check: yes
-      environment:
-        http_proxy: "{{ http_proxy }}"
-        https_proxy: "{{ https_proxy }}"
-        no_proxy: "{{ no_proxy }}"
-