diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js
index 87d65b633b..4e569b7e2c 100644
--- a/src/sunstone/public/js/opennebula.js
+++ b/src/sunstone/public/js/opennebula.js
@@ -354,37 +354,38 @@ var OpenNebula = {
             var timeout = params.timeout || false;
             var request = OpenNebula.Helper.request(resource,"list");
             var req_path = path ? path : resource.toLowerCase();
+            var cache_name = params.cache_name ? params.cache_name : resource;
 
-            if( list_cache[resource] &&
-                list_cache[resource]["timestamp"] + cache_expire > new Date().getTime()){
+            if( list_cache[cache_name] &&
+                list_cache[cache_name]["timestamp"] + cache_expire > new Date().getTime()){
 
-                //console.log(resource+" list. Cache used");
+                console.log(cache_name+" list. Cache used");
 
                 return callback ?
-                    callback(request, list_cache[resource]["data"]) : null;
+                    callback(request, list_cache[cache_name]["data"]) : null;
             }
 
             // TODO: Because callbacks are queued, we may need to force a
             // timeout. Otherwise a blocked call cannot be retried.
 
-            if (!list_callbacks[resource]){
-                list_callbacks[resource] = [];
+            if (!list_callbacks[cache_name]){
+                list_callbacks[cache_name] = [];
             }
 
-            list_callbacks[resource].push({
+            list_callbacks[cache_name].push({
                 success : callback,
                 error : callback_error
             });
 
-            //console.log(resource+" list. Callback queued");
+            console.log(cache_name+" list. Callback queued");
 
-            if (list_waiting[resource]){
+            if (list_waiting[cache_name]){
                 return;
             }
 
-            list_waiting[resource] = true;
+            list_waiting[cache_name] = true;
 
-            //console.log(resource+" list. NO cache, calling ajax");
+            console.log(cache_name+" list. NO cache, calling ajax");
 
             $.ajax({
                 url: req_path,
@@ -394,42 +395,42 @@ var OpenNebula = {
                 success: function(response){
                     var list = OpenNebula.Helper.pool(resource,response)
 
-                    list_cache[resource] = {
+                    list_cache[cache_name] = {
                         timestamp   : new Date().getTime(),
                         data        : list
                     };
 
-                    list_waiting[resource] = false;
+                    list_waiting[cache_name] = false;
 
-                    for (var i=0; i<list_callbacks[resource].length; i++)
+                    for (var i=0; i<list_callbacks[cache_name].length; i++)
                     {
-                        var callback = list_callbacks[resource][i].success;
+                        var callback = list_callbacks[cache_name][i].success;
 
                         if (callback){
-                            //console.log(resource+" list. Callback called");
+                            console.log(cache_name+" list. Callback called");
                             callback(request, list);
                         }
                     }
 
-                    list_callbacks[resource] = [];
+                    list_callbacks[cache_name] = [];
 
                     return;
                 },
                 error: function(response)
                 {
-                    list_waiting[resource] = false;
+                    list_waiting[cache_name] = false;
 
-                    for (var i=0; i<list_callbacks[resource].length; i++)
+                    for (var i=0; i<list_callbacks[cache_name].length; i++)
                     {
-                        var callback = list_callbacks[resource][i].error;
+                        var callback = list_callbacks[cache_name][i].error;
 
                         if (callback){
-                            //console.log(resource+" list. ERROR Callback called");
+                            console.log(cache_name+" list. ERROR Callback called");
                             callback(request, OpenNebula.Error(response));
                         }
                     }
 
-                    list_callbacks[resource] = [];
+                    list_callbacks[cache_name] = [];
 
                     return;
                 }
diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js
index 2d3024a35c..96002a394e 100644
--- a/src/sunstone/public/js/plugins/oneflow-services.js
+++ b/src/sunstone/public/js/plugins/oneflow-services.js
@@ -32,6 +32,7 @@ var Service = {
         OpenNebula.Action.del(params,Service.resource, Service.path);
     },
     "list" : function(params){
+        params.cache_name = "SERVICE";
         OpenNebula.Action.list(params, Service.resource, Service.path)
     },
     "show" : function(params){
diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js
index 13ec753e46..57bc1295ac 100644
--- a/src/sunstone/public/js/plugins/oneflow-templates.js
+++ b/src/sunstone/public/js/plugins/oneflow-templates.js
@@ -43,6 +43,7 @@ var ServiceTemplate = {
         OpenNebula.Action.del(params,ServiceTemplate.resource, ServiceTemplate.path);
     },
     "list" : function(params){
+        params.cache_name = "SERVICE_TEMPLATE";
         OpenNebula.Action.list(params, ServiceTemplate.resource, ServiceTemplate.path)
     },
     "show" : function(params){