Move bc checks when extracting maps into _map_cache