file cache model fixes