diff --git a/modules/core/core.py b/modules/core/core.py
index cc66b05..e992658 100755
--- a/modules/core/core.py
+++ b/modules/core/core.py
@@ -282,7 +282,7 @@ class CraftBeerPI(object):
         self.cache["messages"] = []
         self.cache["version"] = "3.1"
         self.modules = {}
-        self.cache["users"] = {'manuel': {'pw': 'secret'}}
+
         self.addon = Addon(self)
         self.actor = ActorCore(self)
         self.sensor = SensorCore(self)
diff --git a/modules/system/__init__.py b/modules/system/__init__.py
index bb467f2..91ddd9f 100755
--- a/modules/system/__init__.py
+++ b/modules/system/__init__.py
@@ -174,7 +174,8 @@ class SystemView(FlaskView):
           200:
             description: CraftBeerPi System Cache
         """
-        return json.dumps(cbpi.cache)
+        return Response(response=json.dumps(cbpi.cache, sort_keys=True, indent=4), status=200, mimetype='application/json')
+
 
 
 @cbpi.addon.core.initializer()