Add support for block mappings; fix caching bugs for instance lists