SnapshotFileCache causes too many cache refreshes. (churro morales)
Merge remote-tracking branch 'remotes/origin/0.94' into 0.94