diff --git a/.gitignore b/.gitignore
index 3a01c2d..04095c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 ._*
 .fuse_*
-.DS_Store
\ No newline at end of file
+.DS_Store
+qrcodes/*.png
\ No newline at end of file
diff --git a/README.md b/README.md
index f416dbf..0539151 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,15 @@ $ git clone https://github.com/invite-frey/is-woo-payment-fps.git
 * Output QR Code at a higher priority during WP startup
 * Form validation for the Payment Gateway settings
 
+### 1.31
+* Bug fixes
+
+### 1.4
+* Optional QRCode caching added
+
+### 1.41
+* Bugfix
+
 ## Donations
 
 Donations are much appreciated if you found this resource useful. 
diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php
index 1a512fc..6190d84 100644
--- a/hong-kong-fps-woo-payment.php
+++ b/hong-kong-fps-woo-payment.php
@@ -1,14 +1,14 @@
 <?php 
 /**
  * @package Hong_Kong_FPS_Woo_Payment
- * @version 1.3
+ * @version 1.41
  */
 /*
 Plugin Name: Hong Kong FPS Woo Payment
 Plugin URI: https://github.com/invite-frey/is-woo-payment-fps
 Description: Woocommerce payment method enabling Hong Kong FPS payments. Displays QR code and FPS payent if to user. Requires manual confirmation.
 Author: Frey Mansikkaniemi, invITe Services
-Version: 1.3
+Version: 1.41
 Author URI: http://frey.hk/
 License: GPLv3
 */
@@ -53,6 +53,18 @@ function its_wpf_add_class( $methods ){
 }
 
 
+/**
+ * Reqister query var for qrcode image generation
+ */
+
+add_filter( 'query_vars', 'its_wpf_qrcode_add_var' );
+function its_wpf_qrcode_add_var( $vars )
+{
+    $vars[] = 'generate_fps_qrcode';
+    $vars[] = '_wpnonce';
+    return $vars;
+}
+
 /**
  * Print out qr code when the right query var is found
  */
@@ -60,15 +72,18 @@ function its_wpf_add_class( $methods ){
 add_action( 'init', 'its_wpf_qrcode_catch', 0 );
 function its_wpf_qrcode_catch()
 {   
-    $qrcode_string = $_REQUEST['generate_fps_qrcode'];
-    $nonce = $_REQUEST['_wpnonce'];
-    if( $qrcode_string && $nonce && wp_verify_nonce( $nonce, ITS_WPF_PLUGIN_ID ) )
+    if(isset($_REQUEST['generate_fps_qrcode']) && isset($_REQUEST['_wpnonce']))
     {
-        require_once('libs/phpqrcode.php');
-	ob_clean(); //Clean the output buffer before printing out image
-        header('Content-Type: image/png');        
-        QRcode::png($qrcode_string,false,QR_ECLEVEL_H);
-        exit();
+        $qrcode_string = $_REQUEST['generate_fps_qrcode'];
+        $nonce = $_REQUEST['_wpnonce'];
+        if( $qrcode_string && $nonce && wp_verify_nonce( $nonce, ITS_WPF_PLUGIN_ID ) )
+        {
+            require_once('libs/phpqrcode.php');
+            ob_clean(); //Clean the output buffer before printing out image
+            header('Content-Type: image/png');        
+            QRcode::png($qrcode_string,false,QR_ECLEVEL_H);
+            exit();
+        }
     }
 }
 
diff --git a/qrcodes/readme.txt b/qrcodes/readme.txt
new file mode 100644
index 0000000..cee8006
--- /dev/null
+++ b/qrcodes/readme.txt
@@ -0,0 +1 @@
+Dynamically generated qrcodes are saved here
diff --git a/readme.txt b/readme.txt
index b44579e..6725ce0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -58,3 +58,12 @@ Enables [FPS](https://www.hkma.gov.hk/eng/key-functions/international-financial-
 = 1.3 =
 * Output QR Code at a higher priority during WP startup
 * Form validation for the Payment Gateway settings
+
+= 1.31 =
+* Bug fixes
+
+= 1.4 =
+* Optional QRCode caching added
+
+= 1.41 =
+* Bugfix
diff --git a/wc-gateway-invite-fps-payment-gateway-class.php b/wc-gateway-invite-fps-payment-gateway-class.php
index fcf5d9a..f5037d4 100644
--- a/wc-gateway-invite-fps-payment-gateway-class.php
+++ b/wc-gateway-invite-fps-payment-gateway-class.php
@@ -24,6 +24,7 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
             $this->account_bank_code = $this->get_option( 'account_bank_code' );
             $this->ask_to_pay = $this->get_option( 'ask_to_pay' );
             $this->fps_payment_reference_guide = $this->get_option( 'fps_payment_reference_guide' );
+            $this->write_qr_code_to_file = $this->get_option('write_qr_code_to_file');
     
             add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
         }
@@ -83,6 +84,13 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
                     'description' => __('The ask to pay function must be enabled by your bank in order to use payment reference numbers.',ITS_WPF_PLUGIN_ID),
                     'default'     => 'no'
                 ),
+                'write_qr_code_to_file' => array(
+                    'title'       => __('Write QRCode to file',ITS_WPF_PLUGIN_ID),
+                    'label'       => __('Write QRCode to file',ITS_WPF_PLUGIN_ID),
+                    'type'        => 'checkbox',
+                    'description' => __('Enable this option if the QRCode does not show up, or if you want to cache each generated QRCode to a file for reuse. Provides better performance if the total amount is often the same.',ITS_WPF_PLUGIN_ID),
+                    'default'     => 'no'
+                ),
             );
         }
 
@@ -233,6 +241,18 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
     
             return $url;
         }
+
+        private function qrcode_file_url($data_string){
+            $path = plugin_dir_path( __FILE__ ) . "qrcodes/";
+            $filename =  md5($data_string) . '.png';
+
+            if( !file_exists($path . $filename) ){
+                require_once('libs/phpqrcode.php');  
+                QRcode::png($data_string,$path . $filename,QR_ECLEVEL_H);
+            }
+
+            return plugin_dir_url( __FILE__ ) . "qrcodes/" . $filename;
+        }
     
         public function payment_fields() {
     
@@ -249,11 +269,14 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
             $fps_data['currency'] = $fps_data['curr'];
             $qrcode = new ITS_FPS_QRCodeData($fps_data);
     
-            $qr_code_url = add_query_arg(
-                '_wpnonce',
-                wp_create_nonce(ITS_WPF_PLUGIN_ID),
-                get_site_url() . '/?generate_fps_qrcode=' . urlencode($qrcode->getDataString())                
-            );
+            $qr_code_url = 
+                $this->write_qr_code_to_file === 'yes' ? 
+                $this->qrcode_file_url($qrcode->getDataString()) :
+                add_query_arg(
+                    '_wpnonce',
+                    wp_create_nonce(ITS_WPF_PLUGIN_ID),
+                    get_site_url() . '/?generate_fps_qrcode=' . urlencode($qrcode->getDataString())                
+                );
 
             if ( $this->description ) {
                 echo wpautop( wp_kses_post( $this->description ) );