Using MutableMap

core/src/commonMain/kotlin/com/xebia/functional/xef/llm/assistants/CachedTool.kt

@@ -6,7 +6,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 
 abstract class CachedTool<Input, Output>(
-  private val cache: Atomic<MutableList<CachedToolInfo<Input, Output>>>,
+  private val cache: Atomic<MutableMap<Input, CachedToolInfo<Output>>>,
   private val timeCachePolicy: Duration = 1.days
 ) : Tool<Input, Output> {
 
@@ -17,17 +17,17 @@ abstract class CachedTool<Input, Output>(
   abstract suspend fun onCacheMissed(input: Input): Output
 
   private suspend fun cache(input: Input, block: suspend () -> Output): Output {
-    val cachedToolInfo = cache.get().find { it.request == input }
+    val cachedToolInfo = cache.get().get(input)
     if (cachedToolInfo != null) {
       val lastTimeInCache = timeInMillis() - timeCachePolicy.inWholeMilliseconds
       if (lastTimeInCache > cachedToolInfo.timestamp) {
-        cache.get().remove(cachedToolInfo)
+        cache.get().remove(input)
       } else {
         return cachedToolInfo.response
       }
     }
     val response = block()
-    cache.get().add(CachedToolInfo(input, response, timeInMillis()))
+    cache.get().put(input, CachedToolInfo(response, timeInMillis()))
     return response
   }
 }

core/src/commonMain/kotlin/com/xebia/functional/xef/llm/assistants/CachedToolInfo.kt

@@ -1,7 +1,3 @@
 package com.xebia.functional.xef.llm.assistants
 
-data class CachedToolInfo<Request, Response>(
-  val request: Request,
-  val response: Response,
-  val timestamp: Long
-)
+data class CachedToolInfo<Response>(val response: Response, val timestamp: Long)