diff --git a/www/package.json b/www/package.json
index 40b4d0432..7ef08b028 100755
--- a/www/package.json
+++ b/www/package.json
@@ -21,6 +21,7 @@
     "angular-bootstrap-multiselect": "git+https://github.com/bentorfs/angular-bootstrap-multiselect.git",
     "angular-clipboard": "^1.6.2",
     "angular-images-resizer": "^2.0.2",
+    "angular-input-masks": "^4.1.0",
     "angular-local-storage": "^0.7.1",
     "angular-messages": "1.6.8",
     "angular-moment": "^1.2.0",
diff --git a/www/src/app/index.module.js b/www/src/app/index.module.js
index 85b081c67..6a3e7f91c 100755
--- a/www/src/app/index.module.js
+++ b/www/src/app/index.module.js
@@ -33,6 +33,7 @@ const App = angular.module('cortex', [
   'btorfs.multiselect',
   'LocalStorageModule',
   'angularUtils.directives.dirPagination',
+  'ui.utils.masks',
 
   // core
   coreModule.name,
diff --git a/www/src/app/index.vendor.js b/www/src/app/index.vendor.js
index 2380d377c..63ada7239 100755
--- a/www/src/app/index.vendor.js
+++ b/www/src/app/index.vendor.js
@@ -40,6 +40,8 @@ import 'angular-images-resizer';
 
 import 'angular-base64-upload';
 
+import 'angular-input-masks';
+
 // local scripts
 //import "../assets/js/...";
 
diff --git a/www/src/app/pages/admin/organizations/components/analyzer-config-form.controller.js b/www/src/app/pages/admin/organizations/components/analyzer-config-form.controller.js
index 445f71ac5..6e2a9988f 100644
--- a/www/src/app/pages/admin/organizations/components/analyzer-config-form.controller.js
+++ b/www/src/app/pages/admin/organizations/components/analyzer-config-form.controller.js
@@ -11,6 +11,11 @@ export default class AnalyzerConfigFormController {
     this.rateUnits = ['Day', 'Month'];
   }
 
+  $onInit() {
+    this.useGlobalCache =
+      this.analyzer.jobCache === null || this.analyzer.jobCache === undefined;
+  }
+
   applyConfig(config) {
     _.forEach(
       _.keys(config),
diff --git a/www/src/app/pages/admin/organizations/components/analyzer-config-form.html b/www/src/app/pages/admin/organizations/components/analyzer-config-form.html
index ec89c439a..287c058d1 100644
--- a/www/src/app/pages/admin/organizations/components/analyzer-config-form.html
+++ b/www/src/app/pages/admin/organizations/components/analyzer-config-form.html
@@ -73,7 +73,7 @@ <h4>
   <div class="form-group">
     <label class="col-sm-3 control-label">Rate Limiting</label>
     <div class="col-sm-4">
-      <input class="form-control" type="number" ng-model="$ctrl.analyzer.rate">
+      <input class="form-control" type="text" ng-model="$ctrl.analyzer.rate" ui-number-mask="0" ui-hide-group-sep>
     </div>
     <div class="col-sm-5">      
       <select class="form-control" ng-model="$ctrl.analyzer.rateUnit" ng-options="unit for unit in $ctrl.rateUnits">
@@ -83,5 +83,21 @@ <h4>
     <div class="col-sm-offset-3 col-sm-9">
       <p class="help-block">Define the maximum number of requests and the associated unit if applicable.</p>
     </div>  
-  </div>  
+  </div>
+  <div class="form-group">
+    <label class="col-sm-3 control-label">Cache</label>
+    <div class="col-sm-9 form-inline">
+      <div class="btn-group">
+        <label uib-btn-radio="true" class="btn btn-default" ng-model="$ctrl.useGlobalCache" ng-click="$ctrl.analyzer.jobCache = null">Use global</label>
+        <label uib-btn-radio="false" class="btn btn-default" ng-model="$ctrl.useGlobalCache">Custom</label>
+      </div>
+      <div class="form-group" style="margin-left: 30px;" ng-show="$ctrl.useGlobalCache === false">
+        <label>Number of minutes</label>
+        <input class="form-control" style="width: 200px;" type="text" ng-model="$ctrl.analyzer.jobCache" ui-number-mask="0" ui-hide-group-sep>        
+      </div>
+    </div>
+    <div class="col-sm-offset-3 col-sm-9">
+      <p class="help-block">Define the number minutes for analysis report caching, or use the globally defined value.</p>
+    </div>
+  </div>
 </section>
\ No newline at end of file
diff --git a/www/src/app/pages/admin/organizations/components/analyzer.edit.controller.js b/www/src/app/pages/admin/organizations/components/analyzer.edit.controller.js
index 060c97043..c8f0f7bbf 100644
--- a/www/src/app/pages/admin/organizations/components/analyzer.edit.controller.js
+++ b/www/src/app/pages/admin/organizations/components/analyzer.edit.controller.js
@@ -31,7 +31,8 @@ export default class AnalyzerEditController {
         name: this.definition.id,
         configuration: {},
         rate: undefined,
-        rateUnit: undefined
+        rateUnit: undefined,
+        jobCache: null
       };
 
       _.forEach(this.definition.configurationItems, item => {
diff --git a/www/src/app/pages/admin/organizations/components/analyzers-list.controller.js b/www/src/app/pages/admin/organizations/components/analyzers-list.controller.js
index 79fd9de26..1a2e0d44e 100644
--- a/www/src/app/pages/admin/organizations/components/analyzers-list.controller.js
+++ b/www/src/app/pages/admin/organizations/components/analyzers-list.controller.js
@@ -96,7 +96,14 @@ export default class OrganizationAnalyzersController {
         } else {
           return this.OrganizationService.updateAnalyzer(
             analyzer.id,
-            _.pick(response, 'configuration', 'rate', 'rateUnit', 'name')
+            _.pick(
+              response,
+              'configuration',
+              'rate',
+              'rateUnit',
+              'name',
+              'jobCache'
+            )
           );
         }
       })