[WIP] Caching catalogs