get rid of the client map and instead use the endpoint info property
directly.