Minor fixes for file cache