diff --git a/aws/context.go b/aws/context.go
deleted file mode 100644
index 4d8e26ef3215..000000000000
--- a/aws/context.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package aws
-
-import (
-	"context"
-	"time"
-)
-
-type suppressedContext struct {
-	context.Context
-}
-
-func (s *suppressedContext) Deadline() (deadline time.Time, ok bool) {
-	return time.Time{}, false
-}
-
-func (s *suppressedContext) Done() <-chan struct{} {
-	return nil
-}
-
-func (s *suppressedContext) Err() error {
-	return nil
-}
diff --git a/aws/credential_cache.go b/aws/credential_cache.go
index 623890e8d801..c5d70efc92ee 100644
--- a/aws/credential_cache.go
+++ b/aws/credential_cache.go
@@ -101,7 +101,7 @@ func (p *CredentialsCache) Retrieve(ctx context.Context) (Credentials, error) {
 	}
 
 	resCh := p.sf.DoChan("", func() (interface{}, error) {
-		return p.singleRetrieve(&suppressedContext{ctx})
+		return p.singleRetrieve(context.WithoutCancel(ctx))
 	})
 	select {
 	case res := <-resCh: