*9001* Fix file caching problems