diff --git a/lib/liboci_sdk/main.go b/lib/liboci_sdk/main.go
index 5941938f93df..c5276a6551cb 100644
--- a/lib/liboci_sdk/main.go
+++ b/lib/liboci_sdk/main.go
@@ -215,20 +215,18 @@ func FatalIfError(err error) {
 	}
 }
 
-//export NewOCIClient
-func NewOCIClient() C.uint {
-
+func NewOCIClientInfo() ClientInfo {
 	// Use an instance principal provider
 	provider, err := auth.InstancePrincipalConfigurationProvider()
-	log.Info("provider: ", provider)
 	FatalIfError(err)
-
 	client, err := objectstorage.NewObjectStorageClientWithConfigurationProvider(provider)
-	log.Info("client: ", client)
 	FatalIfError(err)
+	return ClientInfo{client, atomic.Uint64{}}
+}
 
-	// store client in a global map (we can't pass back structs with embedded pointers)
-	clientInfo := ClientInfo{client, atomic.Uint64{}}
+//export NewOCIClient
+func NewOCIClient() C.uint {
+	clientInfo := NewOCIClientInfo()
 
 	retryCountRateLimitErrors := func(r common.OCIOperationResponse) bool {
 		if r.Error == nil && r.Response.HTTPResponse().StatusCode == 429 {
@@ -240,19 +238,23 @@ func NewOCIClient() C.uint {
 		// we simply retry all network failures, obviously ephemeral or otherwise, so rather than
 		// trying to patch individual failures as they occur, we adopt that approach here as well.
 		if r.Error != nil {
+			log.Debug("ShouldRetry error: ", r.Error)
 			if _, ok := r.Error.(net.Error); ok {
 				return true
 			}
 		}
 		return common.DefaultShouldRetryOperation(r)
 	}
-	retryPolicy := common.NewRetryPolicyWithOptions(
-		common.WithUnlimitedAttempts(time.Duration(24*time.Hour)),
-		common.WithExponentialBackoff(time.Duration(10*time.Second), 2),
-		common.WithShouldRetryOperation(retryCountRateLimitErrors),
-	)
-	client.SetCustomClientConfiguration(common.CustomClientConfiguration{RetryPolicy: &retryPolicy})
+	retryPolicy := common.DefaultRetryPolicyWithoutEventualConsistency()
+	common.WithUnlimitedAttempts(time.Duration(24 * time.Hour))(&retryPolicy)
+	common.WithExponentialBackoff(time.Duration(10*time.Second), 2)(&retryPolicy)
+	common.WithShouldRetryOperation(retryCountRateLimitErrors)(&retryPolicy)
 
+	clientInfo.client.SetCustomClientConfiguration(common.CustomClientConfiguration{
+		RetryPolicy: &retryPolicy,
+	})
+
+	// store client in a global map (we can't pass back structs with embedded pointers)
 	cid := globalState.Insert(&clientInfo)
 	log.Info("NewOCIClient() ->", cid)
 	log.Info("GOMAXPROCS():", runtime.GOMAXPROCS(-1))