Better separation of directories in the cache