diff --git a/tasks/create-saml-keys-cert.yml b/tasks/create-saml-keys-cert.yml
index 8828746..3459ae0 100644
--- a/tasks/create-saml-keys-cert.yml
+++ b/tasks/create-saml-keys-cert.yml
@@ -1,4 +1,9 @@
 ---
+- name: Assert that service provider key file exists
+  stat:
+    path: "{{ sso_saml_service_provider_key_filename}}"
+  register: key
+
 - block:
   - name: Create SAML folder
     file:
@@ -59,3 +64,4 @@
       chdir: "{{ saml_folder }}"
 
   become: yes
+  when: key.stat.exists == false
diff --git a/tasks/main.yml b/tasks/main.yml
index 76ea973..90645b9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,6 +15,9 @@
   - { key: 'sso_jwt_signinig_key_filepath', value: '{{ sso_jwt_signinig_key_filepath }}' }
   - { key: 'sso_saml_service_provider_key', value: '{{ sso_saml_service_provider_key }}' }
   - { key: 'sso_saml_service_provider_certificate', value: '{{ sso_saml_service_provider_certificate }}' }
+  - { key: 'edge_sso_installation_config_filename' , value: '{{ edge_sso_installation_config_filename }}' }
+  - { key: 'edge_sso_installation_config_file', value: "{{ edge_sso_installation_config_file }}" }
+  - { key: 'saml_folder', value: "{{ saml_folder }}" }
 
 - name: Create Private key and Self Signed Certificate Request
   tags: ['private']
@@ -24,15 +27,6 @@
   tags: ['verify']
   include_tasks: create-jwt-keys.yml
 
-- name: Update cache with key and value
-  cache:
-    key: "{{ item.key }}"
-    value: "{{ item.value }}"
-  with_items:
-  - { key: 'edge_sso_installation_config_filename' , value: '{{ edge_sso_installation_config_filename }}' }
-  - { key: 'edge_sso_installation_config_file', value: "{{ edge_sso_installation_config_file }}" }
-  - { key: 'saml_folder', value: "{{ saml_folder }}" }
-
 - block:
   - name: Copy metadata file if provided
     copy: