diff --git a/example_gh_test.go b/example_gh_test.go
index c16f1b0..b5949bb 100644
--- a/example_gh_test.go
+++ b/example_gh_test.go
@@ -103,7 +103,7 @@ func ExampleRESTClient_pagination() {
 		}
 		return "", false
 	}
-	client, err := gh.RESTClient(nil)
+	client, err := api.DefaultRESTClient()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -195,8 +195,8 @@ func ExampleGQLClient() {
 }
 
 // Add a star to the cli/go-gh repository using the GQL API.
-func ExampleGQLClient_mutate_simple() {
-	client, err := gh.GQLClient(nil)
+func ExampleGQLClient_mutate() {
+	client, err := api.DefaultGQLClient()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -231,7 +231,7 @@ func ExampleGQLClient_mutate_simple() {
 
 // Query releases from cli/cli repository using GQL API with paginated results.
 func ExampleGQLClient_pagination() {
-	client, err := gh.GQLClient(nil)
+	client, err := api.DefaultGQLClient()
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/pkg/api/cache_test.go b/pkg/api/cache_test.go
index b423998..5ae9196 100644
--- a/pkg/api/cache_test.go
+++ b/pkg/api/cache_test.go
@@ -31,13 +31,17 @@ func TestCacheResponse(t *testing.T) {
 
 	cacheDir := filepath.Join(t.TempDir(), "gh-cli-cache")
 
-	httpClient, _ := NewHTTPClient(
+	httpClient, err := NewHTTPClient(
 		ClientOptions{
+			Host:         "github.com",
+			AuthToken:    "token",
 			Transport:    fakeHTTP,
 			EnableCache:  true,
 			CacheDir:     cacheDir,
 			LogIgnoreEnv: true,
-		})
+		},
+	)
+	assert.NoError(t, err)
 
 	do := func(method, url string, body io.Reader) (string, error) {
 		req, err := http.NewRequest(method, url, body)
@@ -57,7 +61,6 @@ func TestCacheResponse(t *testing.T) {
 	}
 
 	var res string
-	var err error
 
 	res, err = do("GET", "http://example.com/path", nil)
 	assert.NoError(t, err)
@@ -112,13 +115,17 @@ func TestCacheResponseRequestCacheOptions(t *testing.T) {
 
 	cacheDir := filepath.Join(t.TempDir(), "gh-cli-cache")
 
-	httpClient, _ := NewHTTPClient(
+	httpClient, err := NewHTTPClient(
 		ClientOptions{
+			Host:         "github.com",
+			AuthToken:    "token",
 			Transport:    fakeHTTP,
 			EnableCache:  false,
 			CacheDir:     cacheDir,
 			LogIgnoreEnv: true,
-		})
+		},
+	)
+	assert.NoError(t, err)
 
 	do := func(method, url string, body io.Reader) (string, error) {
 		req, err := http.NewRequest(method, url, body)
@@ -140,7 +147,6 @@ func TestCacheResponseRequestCacheOptions(t *testing.T) {
 	}
 
 	var res string
-	var err error
 
 	res, err = do("GET", "http://example.com/path", nil)
 	assert.NoError(t, err)