diff --git a/bitbake/lib/toaster/toastergui/widgets.py b/bitbake/lib/toaster/toastergui/widgets.py
index f5a1b3e7b9..e257c702eb 100644
--- a/bitbake/lib/toaster/toastergui/widgets.py
+++ b/bitbake/lib/toaster/toastergui/widgets.py
@@ -36,6 +36,7 @@ import types
 import json
 import collections
 import operator
+import re
 
 from toastergui.views import objtojson
 
@@ -251,10 +252,12 @@ class ToasterTable(TemplateView):
         for key, val in kwargs.iteritems():
             cache_name = cache_name + str(key) + str(val)
 
+        # No special chars allowed in the cache name
+        cache_name = re.sub(r'[^A-Za-z0-9]', "", cache_name)
         data = cache.get(cache_name)
 
-        #if data:
-        #    return data
+        if data:
+            return data
 
         self.setup_columns(**kwargs)