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

    @setPath(@project.resolve(filePath)) if @project

  loadSync: ->
    @updateCachedDiskContents()
    @reload() if @loadFromDisk
    @text.clearUndoStack()

  load: ->
    @updateCachedDiskContentsAsync().then =>
      @reload() if @loadFromDisk
      @text.clearUndoStack()
      this

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

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

    @file.on "moved", =>
