Cached folders

nit: bail early rather then nesting