diff --git a/cmd/eksterd/auth.go b/cmd/eksterd/auth.go
index 0c31bf2..afea084 100644
--- a/cmd/eksterd/auth.go
+++ b/cmd/eksterd/auth.go
@@ -63,21 +63,12 @@ func (b *memoryBackend) cachedCheckAuthToken(conn redis.Conn, header string, r *
 }
 
 // setCachedTokenResponseValue remembers the value of the auth token response in redis
-func setCachedTokenResponseValue(conn redis.Conn, key string, r *auth.TokenResponse) {
+func setCachedTokenResponseValue(conn redis.Conn, key string, r *auth.TokenResponse) error {
 	_, err := conn.Do("HMSET", redis.Args{}.Add(key).AddFlat(r)...)
 	if err != nil {
-		log.Printf("Error while setting token: %v\n", err)
-	} else {
-		_, err = conn.Do("EXPIRE", key, uint64(10*time.Minute/time.Second))
-		if err != nil {
-			log.Printf("Error while setting expire on token: %v\n", err)
-			log.Println("Deleting token")
-			_, err = conn.Do("DEL", key)
-			if err != nil {
-				log.Printf("Deleting token failed: %v", err)
-			}
-		}
+		return fmt.Errorf("error while setting token: %v", err)
 	}
+	conn.Do("EXPIRE", key, uint64(10*time.Minute/time.Second))
 }
 
 // getCachedValue gets the cached value from Redis