ref: refs/heads/filecache-race-condition-fix
