From a5edb8096fd8ae019dfc7df1ee249aa75edc8ed4 Mon Sep 17 00:00:00 2001
From: Artem Vysochyn <artem.vysochyn@gmail.com>
Date: Wed, 24 Feb 2021 19:44:05 +0200
Subject: [PATCH 1/2] Fixed  caching behavior in JwtTokenResolverImpl, no 
 cache for  errors

---
 .../scalecube/security/tokens/jwt/JwtTokenResolverImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java b/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java
index dec2fb9..8b12522 100644
--- a/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java
+++ b/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java
@@ -102,7 +102,10 @@ private Mono<Key> findKey(String kid, AtomicReference<Mono<Key>> computedValueHo
         (kid1) -> {
           Mono<Key> result =
               computedValueHolder.updateAndGet(
-                  mono -> Mono.defer(() -> keyProvider.findKey(kid)).cache());
+                  mono ->
+                      Mono.defer(() -> keyProvider.findKey(kid1))
+                          .cache()
+                          .doOnError(ex -> keyResolutions.remove(kid1)));
           scheduleCleanup(kid, computedValueHolder);
           return result;
         });

From 180fdbb0667df0a1ef9d89483434d81838a6a6e7 Mon Sep 17 00:00:00 2001
From: Artem Vysochyn <artem.vysochyn@gmail.com>
Date: Wed, 24 Feb 2021 19:55:37 +0200
Subject: [PATCH 2/2] Fixed tests (updated testcontainers)

---
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 54fb43d..be84bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,9 @@
     <hamcrest.version>1.3</hamcrest.version>
     <junit-jupiter.version>5.4.2</junit-jupiter.version>
     <vault-java-driver.version>5.0.0</vault-java-driver.version>
-    <testcontainers.version>1.14.0</testcontainers.version>
+    <testcontainers.version>1.15.1</testcontainers.version>
+    <!-- TODO: remove explicit version of `jna` once testcontainers fixes dependencies conflict -->
+    <jna.version>5.5.0</jna.version>
   </properties>
 
   <dependencyManagement>
@@ -90,6 +92,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- TestContainers -->
+      <dependency>
+        <groupId>net.java.dev.jna</groupId>
+        <artifactId>jna</artifactId>
+        <version>${jna.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>