Minor tweaks to custom type-map implementation; principally, lock-less reading and caching the default type-map