diff --git a/src/servicex/did_finder/lookup_request.py b/src/servicex/did_finder/lookup_request.py
index 1f45b40..045824c 100644
--- a/src/servicex/did_finder/lookup_request.py
+++ b/src/servicex/did_finder/lookup_request.py
@@ -113,11 +113,10 @@ def lookup_files(self):
                     if self.prefix:
                         af['paths'] = [self.prefix+fp for fp in af['paths']]
                     full_file_list.append(af)
+            if self.mcclient:
+                self.setCachedResults(full_file_list)
             yield full_file_list
 
-        if self.mcclient:
-            self.setCachedResults(full_file_list)
-
         lookup_finish = datetime.now()
 
         if n_files: