Fix caching and slightly changed folder system