(WIP) Cached folders

nit: intent is weird here