Fix some issue with file cache