Yeah, that last one seems reasonable to me. We can always then provide an abstraction to do the request-id-based lookup later if needed.