Commit

File caching fixes