diff --git a/classes/Kohana/Kostache.php b/classes/Kohana/Kostache.php
index dba10d9..bacb1b0 100644
--- a/classes/Kohana/Kostache.php
+++ b/classes/Kohana/Kostache.php
@@ -14,7 +14,7 @@ class Kohana_Kostache {
 
 	protected $_engine;
 
-	public static function factory($cache = FALSE)
+	public static function factory()
 	{
 		$m = new Mustache_Engine(
 			array(
@@ -23,7 +23,7 @@ class Kohana_Kostache {
 				'escape' => function($value) {
 					return html::chars($value);
 				},
-				'cache' => $cache ? APPPATH.'cache/mustache' : NULL,
+				'cache' => APPPATH.'cache/mustache',
 			)
 		);
 
diff --git a/classes/Kohana/Kostache/Layout.php b/classes/Kohana/Kostache/Layout.php
index 5a99de2..1f85dc1 100644
--- a/classes/Kohana/Kostache/Layout.php
+++ b/classes/Kohana/Kostache/Layout.php
@@ -20,11 +20,16 @@ class Kohana_Kostache_Layout extends Kohana_Kostache {
 	 */
 	protected $_layout = 'layout';
 
-	public function __construct($engine, $layout = 'layout')
+	public static function factory($layout = 'layout')
 	{
-		$this->_layout = $layout;
+		$k = parent::factory();
+		$k->set_layout($layout);
+		return $k;
+	}
 
-		parent::__construct($engine);
+	public function set_layout($layout)
+	{
+		$this->_layout = (string) $layout;
 	}
 
 	public function render($class, $template = NULL)