Adding custom caching

src/crewai/agents/executor.py

@@ -24,6 +24,7 @@ class CrewAgentExecutor(AgentExecutor):
     task: Any = None
     tools_description: str = ""
     tools_names: str = ""
+    original_tools: List[Any] = []
     function_calling_llm: Any = None
     request_within_rpm_limit: Any = None
     tools_handler: InstanceOf[ToolsHandler] = None
@@ -202,6 +203,7 @@ class CrewAgentExecutor(AgentExecutor):
             tool_usage = ToolUsage(
                 tools_handler=self.tools_handler,
                 tools=self.tools,
+                original_tools=self.original_tools,
                 tools_description=self.tools_description,
                 tools_names=self.tools_names,
                 function_calling_llm=self.function_calling_llm,

src/crewai/agents/tools_handler.py

@@ -1,7 +1,7 @@
-from typing import Any
+from typing import Any, Optional, Union
 
 from ..tools.cache_tools import CacheTools
-from ..tools.tool_calling import ToolCalling
+from ..tools.tool_calling import InstructorToolCalling, ToolCalling
 from .cache.cache_handler import CacheHandler
 
 
@@ -11,15 +11,20 @@ class ToolsHandler:
     last_used_tool: ToolCalling = {}
     cache: CacheHandler
 
-    def __init__(self, cache: CacheHandler):
+    def __init__(self, cache: Optional[CacheHandler] = None):
         """Initialize the callback handler."""
         self.cache = cache
         self.last_used_tool = {}
 
-    def on_tool_use(self, calling: ToolCalling, output: str) -> Any:
+    def on_tool_use(
+        self,
+        calling: Union[ToolCalling, InstructorToolCalling],
+        output: str,
+        should_cache: bool = True,
+    ) -> Any:
         """Run when tool ends running."""
         self.last_used_tool = calling
-        if calling.tool_name != CacheTools().name:
+        if self.cache and should_cache and calling.tool_name != CacheTools().name:
             self.cache.add(
                 tool=calling.tool_name,
                 input=calling.arguments,