Index: tests/natools-s_expressions-cache_tests.adb
==================================================================
--- tests/natools-s_expressions-cache_tests.adb
+++ tests/natools-s_expressions-cache_tests.adb
@@ -118,10 +118,25 @@
       end Info_Pool;
    begin
       declare
          Cache, Deep, Shallow : Debug_Caches.Reference;
       begin
+         declare
+            Empty_Cursor : Debug_Caches.Cursor := Deep.First;
+            Event : Events.Event;
+         begin
+            Event := Empty_Cursor.Current_Event;
+            if Event /= Events.End_Of_Input then
+               Test.Fail ("Unexpected Empty_Cursor.Current_Event "
+                 & Events.Event'Image (Event)
+                 & " (expected End_Of_Input)");
+            end if;
+
+            Test_Tools.Next_And_Check
+              (Test, Empty_Cursor, Events.End_Of_Input, 0);
+         end;
+
          Inject_Test (Cache);
 
          declare
             First : Debug_Caches.Cursor := Cache.First;
             Output : aliased Test_Tools.Memory_Stream;
@@ -177,10 +192,24 @@
       Test : NT.Test := Report.Item ("Default instantiation");
    begin
       declare
          Cache, Deep, Shallow : Caches.Reference;
       begin
+         declare
+            Empty_Cursor : Caches.Cursor := Deep.First;
+            Event : Events.Event;
+         begin
+            Event := Empty_Cursor.Current_Event;
+            if Event /= Events.End_Of_Input then
+               Test.Fail ("Unexpected Empty_Cursor.Current_Event "
+                 & Events.Event'Image (Event)
+                 & " (expected End_Of_Input)");
+            end if;
+
+            Test_Tools.Next_And_Check
+              (Test, Empty_Cursor, Events.End_Of_Input, 0);
+         end;
          Inject_Test (Cache);
 
          declare
             First : Caches.Cursor := Cache.First;
             Output : aliased Test_Tools.Memory_Stream;