diff --git a/plugins/system/fabrik/fabrik.php b/plugins/system/fabrik/fabrik.php
index ed91e96d222..cbf41b4ee43 100644
--- a/plugins/system/fabrik/fabrik.php
+++ b/plugins/system/fabrik/fabrik.php
@@ -86,8 +86,9 @@ public function plgSystemFabrik(&$subject, $config)
 	public static function js()
 	{
 		$config = JFactory::getConfig();
+		$app = JFactory::getApplication();
 
-		if ($config->get('caching') == 0)
+		if ($config->get('caching') == 0 || $app->isAdmin())
 		{
 			$script = self::buildJs();
 		}
@@ -96,6 +97,14 @@ public static function js()
 			$uri = JURI::getInstance();
 			$session = JFactory::getSession();
 			$uri = $uri->toString(array('path', 'query'));
+
+			/*
+			if ($_SERVER['REQUEST_METHOD'] === 'POST')
+			{
+				$uri .= serialize($_POST);
+			}
+			*/
+
 			$file = md5($uri) . '.js';
 			$folder = JPATH_SITE . '/cache/com_fabrik/js/';