diff --git a/additional-block-attributes.php b/additional-block-attributes.php
index c8dd305..0cecd27 100644
--- a/additional-block-attributes.php
+++ b/additional-block-attributes.php
@@ -68,6 +68,18 @@ public function add_attributes( $block ) {
 			$block->add_attribute( 'data-update-field-is-empty', 'true' );
 		}
 
+		if ( ! empty( $attrs['jfb_update_fields_cache_enabled'] ) && ! empty( $attrs['jfb_update_fields_cache_timeout'] ) ) {
+			$block->add_attribute( 'data-update-cache-timeout', $attrs['jfb_update_fields_cache_timeout'] );
+		}
+
+		$cache_timeout = $attrs['jfb_update_fields_cache_timeout'] ?? 60;
+
+		if ( isset( $attrs['jfb_update_fields_cache_enabled'] ) && $attrs['jfb_update_fields_cache_enabled'] === false ) {
+			$cache_timeout = 0;
+		}
+
+		$block->add_attribute( 'data-update-cache-timeout', $cache_timeout );
+
 		if ( ! $this->script_enqueued ) {
 			$this->enqueue_script();
 			$this->script_enqueued = true;
diff --git a/assets/js/blocks.js b/assets/js/blocks.js
index af0ee86..b387981 100644
--- a/assets/js/blocks.js
+++ b/assets/js/blocks.js
@@ -1 +1 @@
-(()=>{"use strict";var e="jfb_update_fields_options_enabled",t="jfb_update_fields_value_enabled",n="jfb_update_fields_update_on_button",r="jfb_update_fields_button_name",l="jfb_update_fields_field_to_listen",o="jfb_update_fields_callback",a="jfb_update_fields_listen_all",i={"jet-forms/select-field":"options","jet-forms/radio-field":"options","jet-forms/checkbox-field":"options","jet-forms/text-field":"value","jet-forms/number-field":"value","jet-forms/textarea-field":"value","jet-forms/hidden-field":"value","jet-forms/submit-field":"update_other"};function u(e){return u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u(e)}function c(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function p(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?c(Object(n),!0).forEach((function(t){f(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function f(e,t,n){return(t=function(e){var t=function(e,t){if("object"!==u(e)||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,"string");if("object"!==u(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"===u(t)?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function m(e){return m="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},m(e)}function s(e,t,n){return(t=function(e){var t=function(e,t){if("object"!==m(e)||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,"string");if("object"!==m(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"===m(t)?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var d=wp.hooks.addFilter,b=wp.compose.createHigherOrderComponent,y=wp.blockEditor.InspectorControls,w=wp.components,v=w.TextControl,h=w.ToggleControl,_=w.Panel,j=w.PanelRow,g=w.PanelBody,E=b((function(u){return function(c){var p=c.name,f=i[p]||!1;if(!f)return wp.element.createElement(u,c);var m=c.attributes,d=c.setAttributes,b=c.isSelected;return wp.element.createElement(React.Fragment,null,wp.element.createElement(u,c),b&&wp.element.createElement(y,null,wp.element.createElement(_,null,("update_other"!==f||"update"===(null==m?void 0:m.action_type))&&wp.element.createElement(g,{title:"Field updater",initialOpen:!1},"update_other"===f&&"update"===(null==m?void 0:m.action_type)&&wp.element.createElement(j,null,wp.element.createElement(v,{label:"Button name",help:"Latin lowercase letters, underscore, dash, numbers.",value:m[r],onChange:function(e){d(s({},r,e))}})),"options"===f&&wp.element.createElement(j,null,wp.element.createElement(h,{label:"Enable options updater",help:m[e]?"Enabled.":"Disabled.",checked:m[e],onChange:function(){d(s({},e,!m[e]))}})),"value"===f&&wp.element.createElement(j,null,wp.element.createElement(h,{label:"Enable value updater",help:m[t]?"Enabled.":"Disabled.",checked:m[t],onChange:function(){d(s({},t,!m[t]))}})),(m[e]||m[t])&&wp.element.createElement(j,null,wp.element.createElement(h,{label:"Update on action button",help:m[n]?"Yes.":"No.",checked:m[n],onChange:function(){d(s({},n,!m[n]))}})),(m[e]||m[t])&&m[n]&&wp.element.createElement(j,null,wp.element.createElement(v,{label:"Button name",help:"",value:m[r],onChange:function(e){d(s({},r,e))}})),(m[e]||m[t])&&!m[n]&&wp.element.createElement(j,null,wp.element.createElement(v,{label:"Fields to listen",help:"comma-separated",value:m[l],onChange:function(e){d(s({},l,e))}})),(m[e]||m[t])&&!m[n]&&wp.element.createElement(j,null,wp.element.createElement(h,{label:"Listen all",help:m[a]?"Yes.":"No.",checked:m[a],onChange:function(){d(s({},a,!m[a]))}})),"value"===f&&m[t]&&wp.element.createElement(j,null,wp.element.createElement(v,{label:"Callback or query parameters",value:m[o],help:"Callback which parameters are $field_name (this field name), $form_id (this form ID), $form_fields (array of all form fields). Alternatively JetEngine query_id|property to get a specified propery from the first object from query.",onChange:function(e){d(s({},o,e))}}))))))}}),"addControls");d("editor.BlockEdit","jet-form-builder/update-fields",E),wp.blocks.registerBlockType,wp.components.TextControl,wp.element.createElement;var k=wp.blocks.registerBlockVariation,O={name:"update",title:"Update Field",isActive:["action_type"],description:"Update fields that are dependent on this button",icon:"update-alt",scope:["block","inserter","transform"],attributes:{action_type:"update"}};(0,wp.hooks.addFilter)("blocks.registerBlockType","jfb-update-field/block-attributes",(function(u,c){var m;return i[c]?(u.attributes=p(p({},u.attributes),{},(f(m={},e,{type:"boolean",default:!1}),f(m,t,{type:"boolean",default:!1}),f(m,l,{type:"string",default:""}),f(m,a,{type:"boolean",default:!1}),f(m,o,{type:"string",default:""}),f(m,n,{type:"boolean",default:!1}),f(m,r,{type:"string",default:""}),m)),u):u})),document.addEventListener("jet-form-builder-initialized",(function(){k("jet-forms/submit-field",O)}))})();
\ No newline at end of file
+(()=>{"use strict";var e="jfb_update_fields_options_enabled",t="jfb_update_fields_value_enabled",n="jfb_update_fields_update_on_button",l="jfb_update_fields_button_name",r="jfb_update_fields_field_to_listen",o="jfb_update_fields_callback",a="jfb_update_fields_listen_all",i="jfb_update_fields_cache_enabled",u="jfb_update_fields_cache_timeout",c={"jet-forms/select-field":"options","jet-forms/radio-field":"options","jet-forms/checkbox-field":"options","jet-forms/text-field":"value","jet-forms/number-field":"value","jet-forms/textarea-field":"value","jet-forms/hidden-field":"value","jet-forms/submit-field":"update_other"};function p(e){return p="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},p(e)}function m(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e);t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function f(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?m(Object(n),!0).forEach((function(t){d(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):m(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function d(e,t,n){return(t=function(e){var t=function(e){if("object"!=p(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var n=t.call(e,"string");if("object"!=p(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==p(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function s(e){return s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s(e)}function b(e,t,n){return(t=function(e){var t=function(e){if("object"!=s(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var n=t.call(e,"string");if("object"!=s(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==s(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var y=wp.hooks.addFilter,h=wp.compose.createHigherOrderComponent,w=wp.blockEditor.InspectorControls,_=wp.components,v=_.TextControl,E=_.ToggleControl,j=_.Panel,g=_.PanelRow,k=_.PanelBody,C=h((function(p){return function(m){var f=m.name,d=c[f]||!1;if(!d)return wp.element.createElement(p,m);var s=m.attributes,y=m.setAttributes,h=m.isSelected;return wp.element.createElement(React.Fragment,null,wp.element.createElement(p,m),h&&wp.element.createElement(w,null,wp.element.createElement(j,null,("update_other"!==d||"update"===(null==s?void 0:s.action_type))&&wp.element.createElement(k,{title:"Field updater",initialOpen:!1},"update_other"===d&&"update"===(null==s?void 0:s.action_type)&&wp.element.createElement(g,null,wp.element.createElement(v,{label:"Button name",help:"Latin lowercase letters, underscore, dash, numbers.",value:s[l],onChange:function(e){y(b({},l,e))}})),"options"===d&&wp.element.createElement(g,null,wp.element.createElement(E,{label:"Enable options updater",help:s[e]?"Enabled.":"Disabled.",checked:s[e],onChange:function(){y(b({},e,!s[e]))}})),"value"===d&&wp.element.createElement(g,null,wp.element.createElement(E,{label:"Enable value updater",help:s[t]?"Enabled.":"Disabled.",checked:s[t],onChange:function(){y(b({},t,!s[t]))}})),(s[e]||s[t])&&wp.element.createElement(g,null,wp.element.createElement(E,{label:"Update on action button",help:s[n]?"Yes.":"No.",checked:s[n],onChange:function(){y(b({},n,!s[n]))}})),(s[e]||s[t])&&s[n]&&wp.element.createElement(g,null,wp.element.createElement(v,{label:"Button name",help:"",value:s[l],onChange:function(e){y(b({},l,e))}})),(s[e]||s[t])&&!s[n]&&wp.element.createElement(g,null,wp.element.createElement(v,{label:"Fields to listen",help:"comma-separated",value:s[r],onChange:function(e){y(b({},r,e))}})),(s[e]||s[t])&&!s[n]&&wp.element.createElement(g,null,wp.element.createElement(E,{label:"Listen all",help:s[a]?"Yes.":"No.",checked:s[a],onChange:function(){y(b({},a,!s[a]))}})),"value"===d&&s[t]&&wp.element.createElement(g,null,wp.element.createElement(v,{label:"Callback or query parameters",value:s[o],help:"Callback which parameters are $field_name (this field name), $form_id (this form ID), $form_fields (array of all form fields). Alternatively JetEngine query_id|property to get a specified propery from the first object from query.",onChange:function(e){y(b({},o,e))}})),(s[e]||s[t])&&wp.element.createElement(g,null,wp.element.createElement(E,{label:"Enable cache",help:s[i]?"Yes.":"No.",checked:s[i],onChange:function(){y(b({},i,!s[i]))}})),(s[e]||s[t])&&s[i]&&wp.element.createElement(g,null,wp.element.createElement(v,{type:"number",label:"Cache timeout",help:"Cache timeout in seconds; -1 for unlimited cache time. Cache is cleared on page reload.",min:"-1",max:"86400",value:s[u],onChange:function(e){y(b({},u,e))}}))))))}}),"addControls");y("editor.BlockEdit","jet-form-builder/update-fields",C),wp.blocks.registerBlockType,wp.components.TextControl,wp.element.createElement;var O=wp.blocks.registerBlockVariation,P={name:"update",title:"Update Field",isActive:["action_type"],description:"Update fields that are dependent on this button",icon:"update-alt",scope:["block","inserter","transform"],attributes:{action_type:"update"}};(0,wp.hooks.addFilter)("blocks.registerBlockType","jfb-update-field/block-attributes",(function(p,m){return c[m]?(p.attributes=f(f({},p.attributes),{},d(d(d(d(d(d(d(d(d({},e,{type:"boolean",default:!1}),t,{type:"boolean",default:!1}),r,{type:"string",default:""}),a,{type:"boolean",default:!1}),o,{type:"string",default:""}),n,{type:"boolean",default:!1}),l,{type:"string",default:""}),i,{type:"boolean",default:!0}),u,{type:"string",default:"60"})),p):p})),document.addEventListener("jet-form-builder-initialized",(function(){O("jet-forms/submit-field",P)}))})();
\ No newline at end of file
diff --git a/assets/js/frontend.js b/assets/js/frontend.js
index a689ed8..8fe4cc5 100644
--- a/assets/js/frontend.js
+++ b/assets/js/frontend.js
@@ -284,7 +284,7 @@
 			const formId = observable.form ? observable.form.getFormId() : observable.parent.root.form.getFormId(),
 			      formFields = getFormValues( observable ),
 			      updatedCalculated = observable.rootNode.querySelectorAll( `[data-formula*=${updated}]` ),
-			      cacheTime = updatedNode.dataset.cacheTime || 60;
+			      cacheTime = updatedNode.dataset.updateCacheTimeout || 60;
 
 			if ( aborters[ updated + formId ] ) {
 				aborters[ updated + formId ].abort();
@@ -310,8 +310,9 @@
 			if ( cache.has( hash ) ) {
 				const cached = cache.get( hash );
 
-				if ( + Date.now() - + cached.time < cacheTime * 1000 ) {
+				if ( + Date.now() - + cached.time < cacheTime * 1000 || cacheTime < 0 ) {
 					const response = cached.response;
+
 					updateFieldFromResponse(
 						{
 							response,
diff --git a/assets/js/src/attributes.js b/assets/js/src/attributes.js
index 9062e6e..7893486 100644
--- a/assets/js/src/attributes.js
+++ b/assets/js/src/attributes.js
@@ -1,4 +1,15 @@
-import { FIELD_TO_LISTEN, LISTEN_ALL, OPTIONS_LISTENER_ENABLED, VALUE_LISTENER_ENABLED, SUPPORTED_BLOCKS, CALLBACK, UPDATE_ON_BUTTON, BUTTON_NAME } from './constants';
+import {
+	FIELD_TO_LISTEN,
+	LISTEN_ALL,
+	OPTIONS_LISTENER_ENABLED,
+	VALUE_LISTENER_ENABLED,
+	SUPPORTED_BLOCKS,
+	CALLBACK,
+	UPDATE_ON_BUTTON,
+	BUTTON_NAME,
+	CACHE_ENABLED,
+	CACHE_TIMEOUT,
+} from './constants';
 
 function registerAttributes( settings, name ) {
 
@@ -36,6 +47,14 @@ function registerAttributes( settings, name ) {
 			type: 'string',
 			default: '',
 		},
+		[ CACHE_ENABLED ]: {
+			type: 'boolean',
+			default: true,
+		},
+		[ CACHE_TIMEOUT ]: {
+			type: 'string',
+			default: '60',
+		},
 	};
 
 	return settings;
diff --git a/assets/js/src/constants.js b/assets/js/src/constants.js
index 5f5c631..d18d743 100644
--- a/assets/js/src/constants.js
+++ b/assets/js/src/constants.js
@@ -5,6 +5,8 @@ const BUTTON_NAME = 'jfb_update_fields_button_name';
 const FIELD_TO_LISTEN = 'jfb_update_fields_field_to_listen';
 const CALLBACK = 'jfb_update_fields_callback';
 const LISTEN_ALL = 'jfb_update_fields_listen_all';
+const CACHE_ENABLED = 'jfb_update_fields_cache_enabled';
+const CACHE_TIMEOUT = 'jfb_update_fields_cache_timeout';
 const SUPPORTED_BLOCKS = {
 				'jet-forms/select-field' : 'options',
 				'jet-forms/radio-field' : 'options',
@@ -25,4 +27,6 @@ export {
 	LISTEN_ALL,
 	SUPPORTED_BLOCKS,
 	CALLBACK,
+	CACHE_ENABLED,
+	CACHE_TIMEOUT,
 };
\ No newline at end of file
diff --git a/assets/js/src/controls.js b/assets/js/src/controls.js
index 0ad12f5..fdeb4db 100644
--- a/assets/js/src/controls.js
+++ b/assets/js/src/controls.js
@@ -1,5 +1,15 @@
-import { FIELD_TO_LISTEN, UPDATE_ON_BUTTON, LISTEN_ALL, OPTIONS_LISTENER_ENABLED, VALUE_LISTENER_ENABLED, CALLBACK, BUTTON_NAME } from './constants';
-import { SUPPORTED_BLOCKS } from './constants';
+import {
+	SUPPORTED_BLOCKS,
+	FIELD_TO_LISTEN,
+	UPDATE_ON_BUTTON,
+	LISTEN_ALL,
+	OPTIONS_LISTENER_ENABLED,
+	VALUE_LISTENER_ENABLED,
+	CALLBACK,
+	BUTTON_NAME,
+	CACHE_ENABLED,
+	CACHE_TIMEOUT,
+} from './constants';
 
 const { addFilter } = wp.hooks;
 const { createHigherOrderComponent } = wp.compose;
@@ -147,6 +157,37 @@ const addControls = createHigherOrderComponent( ( BlockEdit ) => {
 											/>
 									</PanelRow>
 								}
+								{ ( attributes[ OPTIONS_LISTENER_ENABLED ] || attributes[ VALUE_LISTENER_ENABLED ] ) &&
+									<PanelRow>
+										<ToggleControl
+											label="Enable cache"
+											help={
+												attributes[ CACHE_ENABLED ]
+													? 'Yes.'
+													: 'No.'
+											}
+											checked={ attributes[ CACHE_ENABLED ] }
+											onChange={ () => {
+												setAttributes( { [ CACHE_ENABLED ] : ! attributes[ CACHE_ENABLED ] } );
+											} }
+										/>
+									</PanelRow>
+								}
+								{ ( attributes[ OPTIONS_LISTENER_ENABLED ] || attributes[ VALUE_LISTENER_ENABLED ] ) && attributes[ CACHE_ENABLED ] &&
+									<PanelRow>
+										<TextControl
+											type="number"
+											label="Cache timeout"
+											help="Cache timeout in seconds; -1 for unlimited cache time. Cache is cleared on page reload."
+											min="-1"
+											max="86400"
+											value={ attributes[ CACHE_TIMEOUT ] }
+											onChange={ newValue => {
+												setAttributes( { [ CACHE_TIMEOUT ] : newValue } );
+											} }
+										/>
+									</PanelRow>
+								}
 							</PanelBody>
 							}
 						</Panel>
diff --git a/jet-form-builder-update-field.php b/jet-form-builder-update-field.php
index 2927b7a..3f9d848 100644
--- a/jet-form-builder-update-field.php
+++ b/jet-form-builder-update-field.php
@@ -3,7 +3,7 @@
  * Plugin Name: JetFormBuilder - Update Fields
  * Plugin URI:
  * Description: 
- * Version:     1.0.1
+ * Version:     1.1.1
  * Author:      
  * Author URI:  
  * Text Domain: 
@@ -33,7 +33,7 @@ class Plugin {
 
 		public $storage = null;
 
-		private $version = '1.1.0';
+		private $version = '1.1.1';
 
 		public function __construct() {
 			add_action( 'plugins_loaded', array( $this, 'jec_init' ) );