diff --git a/src/Mustache/Cache/FilesystemCache.php b/src/Mustache/Cache/FilesystemCache.php
index c6af6ae..28e6c0c 100644
--- a/src/Mustache/Cache/FilesystemCache.php
+++ b/src/Mustache/Cache/FilesystemCache.php
@@ -2,12 +2,12 @@
 
 class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
 {
-    private $directory;
+    private $baseDir;
     private $fileMode;
 
-    public function __construct($directory, $fileMode = null)
+    public function __construct($baseDir, $fileMode = null)
     {
-        $this->directory = $directory;
+        $this->baseDir = $baseDir;
         $this->fileMode = $fileMode;
     }
 
@@ -39,7 +39,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
 
     protected function getCacheFilename($name)
     {
-        return sprintf('%s/%s.php', $this->directory, md5($name));
+        return sprintf('%s/%s.php', $this->baseDir, $name);
     }
 
     private function buildDirectoryForFilename($fileName)
@@ -76,7 +76,7 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
                 $mode = isset($this->fileMode) ? $this->fileMode : (0666 & ~umask());
                 @chmod($fileName, $mode);
 
-                return $fileName;
+                return;
             }
 
             $this->log(
diff --git a/src/Mustache/Cache/NoopCache.php b/src/Mustache/Cache/NoopCache.php
index d717149..47ed17d 100644
--- a/src/Mustache/Cache/NoopCache.php
+++ b/src/Mustache/Cache/NoopCache.php
@@ -11,8 +11,8 @@ class Mustache_Cache_NoopCache extends Mustache_Cache_AbstractCache
     {
         $this->log(
             Mustache_Logger::WARNING,
-            'Template cache disabled, evaluating class at runtime',
-            array()
+            'Template cache disabled, evaluating "{className}" class at runtime',
+            array('className' => $className)
         );
         eval("?>".$compiled);
     }
diff --git a/src/Mustache/Engine.php b/src/Mustache/Engine.php
index bf7f1c5..84d870b 100644
--- a/src/Mustache/Engine.php
+++ b/src/Mustache/Engine.php
@@ -506,7 +506,7 @@ class Mustache_Engine
     public function getCache()
     {
         if (!isset($this->cache)) {
-            $this->cache = new Mustache_Cache_NoopCache();
+            $this->setCache(new Mustache_Cache_NoopCache());
         }
 
         return $this->cache;
@@ -613,9 +613,9 @@ class Mustache_Engine
 
         if (!isset($this->templates[$className])) {
             if (!class_exists($className, false)) {
-                if (!$this->getCache()->load($source)) {
+                if (!$this->getCache()->load($className)) {
                     $compiled = $this->compile($source);
-                    $this->getCache()->cache($source, $compiled);
+                    $this->getCache()->cache($className, $compiled);
                 }
             }