Remove need to serial lookup upfront, reducing async needs upfront