cache folder + bug fixes