Moved CacheDirectory to core/fs