(WIP) Cached folders

nit: use generators rather then blocking here