More hardening around API calls, not loading bootstrapper deps on every call.