     @setPath(@project.resolve(filePath)) if @project
 
   loadSync: ->
-    @updateCachedDiskContents()
+    @updateCachedDiskContentsSync()
     @reload() if @loadFromDisk
     @text.clearUndoStack()
 
   load: ->
-    @updateCachedDiskContentsAsync().then =>
+    @updateCachedDiskContents().then =>
       @reload() if @loadFromDisk
       @text.clearUndoStack()
       this

  subscribeToFile: ->
    @file.on "contents-changed", =>
      @conflict = true if @isModified()
      @updateCachedDiskContentsAsync().done =>
        if @conflict
          @emit "contents-conflicted"
        else
          @reload()

    @file.on "removed", =>
      @updateCachedDiskContentsAsync().done =>
        @emitModifiedStatusChanged(@isModified())

    @file.on "moved", =>

    @emit 'reloaded'

  # Private: Rereads the contents of the file, and stores them in the cache.
  updateCachedDiskContentsSync: ->
    @loaded = true
    @cachedDiskContents = @file?.read() ? ""

  # Private: Rereads the contents of the file, and stores them in the cache.
  updateCachedDiskContents: ->
    Q(@file?.readAsync() ? "").then (contents) =>
      @loaded = true
      @cachedDiskContents = contents
