diff --git a/lib/sass/plugin/staleness_checker.rb b/lib/sass/plugin/staleness_checker.rb
index f9dfcd55b7..77fc48a563 100644
--- a/lib/sass/plugin/staleness_checker.rb
+++ b/lib/sass/plugin/staleness_checker.rb
@@ -1,9 +1,15 @@
 module Sass
   module Plugin
     class StalenessChecker
-      def initialize
+      @dependencies_cache = {}
+
+      class << self
+        attr_accessor :dependencies_cache
+      end
+      
+      def initialize(dependencies = self.class.dependencies_cache)
+        @dependencies                = dependencies
         @mtimes, @dependencies_stale = {}, {}
-        @dependencies = Thread.current[:_sass_file_dependencies] ||= {}
       end
 
       def stylesheet_needs_update?(css_file, template_file)
diff --git a/test/sass/plugin_test.rb b/test/sass/plugin_test.rb
index 8d2f789d2c..57e07629ae 100755
--- a/test/sass/plugin_test.rb
+++ b/test/sass/plugin_test.rb
@@ -357,6 +357,7 @@ def touch(*args)
   end
 
   def reset_mtimes
+    Sass::Plugin::StalenessChecker.dependencies_cache = {}
     atime = Time.now
     mtime = Time.now - 5
     Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each {|f| File.utime(atime, mtime, f)}