diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index 487669479..3c4b71e48 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -15,6 +15,7 @@ class ThemeManager
   constructor: ->
     @loadedThemes = []
     @activeThemes = []
+    @lessCache = null
 
   # Internal-only:
   register: (theme) ->
@@ -81,10 +82,10 @@ class ThemeManager
   loadLessStylesheet: (lessStylesheetPath) ->
     unless lessCache?
       LessCompileCache = require './less-compile-cache'
-      lessCache = new LessCompileCache()
+      @lessCache = new LessCompileCache()
 
     try
-      lessCache.read(lessStylesheetPath)
+      @lessCache.read(lessStylesheetPath)
     catch e
       console.error """
         Error compiling less stylesheet: #{lessStylesheetPath}
diff --git a/src/window.coffee b/src/window.coffee
index 0867e6a08..887ccf62f 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -10,7 +10,6 @@ WindowEventHandler = require './window-event-handler'
 deserializers = {}
 deferredDeserializers = {}
 defaultWindowDimensions = {width: 800, height: 600}
-lessCache = null
 
 ### Internal ###