Resolve the org once per run and route every API call through it (#648)

Resolve the org once per run and route every API call through it (#648) #1154