diff --git a/volttron/platform/aip.py b/volttron/platform/aip.py
index dc7859ec89..07e8219126 100644
--- a/volttron/platform/aip.py
+++ b/volttron/platform/aip.py
@@ -247,6 +247,7 @@ def __init__(self, env, **kwargs):
         if self.message_bus == 'rmq':
             self.rmq_mgmt = RabbitMQMgmt()
         self.instance_name = get_platform_instance_name()
+        self.agent_uuid_name_map = {}
 
     def add_agent_user_group(self):
         user = pwd.getpwuid(os.getuid())
@@ -682,11 +683,14 @@ def remove_agent(self, agent_uuid, remove_auth=True):
             self.remove_agent_user(volttron_agent_user)
 
     def agent_name(self, agent_uuid):
+        if cached_name := self.agent_uuid_name_map.get(agent_uuid):
+            return cached_name
         agent_path = os.path.join(self.install_dir, agent_uuid)
         for agent_name in os.listdir(agent_path):
             dist_info = os.path.join(
                 agent_path, agent_name, agent_name + '.dist-info')
             if os.path.exists(dist_info):
+                self.agent_uuid_name_map[agent_uuid] = agent_name
                 return agent_name
         raise KeyError(agent_uuid)
 
diff --git a/volttron/utils/__init__.py b/volttron/utils/__init__.py
index daa1e1aaa7..e236d5185f 100644
--- a/volttron/utils/__init__.py
+++ b/volttron/utils/__init__.py
@@ -108,7 +108,7 @@ def __init__(self, filetowatch, callback):
         _log.debug("patterns is {}".format([get_home() + '/' + filetowatch]))
         self._callback = callback
 
-    def on_any_event(self, event):
+    def on_closed(self, event):
         _log.debug("Calling callback on event {}. Calling {}".format(event, self._callback))
         try:
             self._callback()
@@ -133,7 +133,7 @@ def __init__(self, filetowatch, callback):
     def watchfile(self):
         return self._filetowatch
 
-    def on_any_event(self, event):
+    def on_closed(self, event):
         _log.debug("Calling callback on event {}. Calling {}".format(event, self._callback))
         try:
             self._callback(self._filetowatch)