Fix fileserver cache race 2014 1

2014.1 version of PR #9854