restructure file system caching