Fixed scoping bug where tokens weren't being cached in the gapi instance