diff --git a/components/codetools/directorycacher.pas b/components/codetools/directorycacher.pas
index 216b71f492..b0f599a21a 100644
--- a/components/codetools/directorycacher.pas
+++ b/components/codetools/directorycacher.pas
@@ -1030,16 +1030,16 @@ begin
         end;
         {$ENDIF}
       end;
-      if Result<>'' then begin
-        // improve unit name
-        NewUnitName:=ExtractFileNameOnly(Result);
-        if (NewUnitName<>lowercase(NewUnitName))
-        and (AUnitName<>NewUnitName) then
-          AUnitName:=NewUnitName;
-      end;
 
       AddToCache(UnitSrc,AUnitName,Result);
     end;
+    if Result<>'' then begin
+      // improve unit name
+      NewUnitName:=ExtractFileNameOnly(Result);
+      if (NewUnitName<>lowercase(NewUnitName))
+      and (AUnitName<>NewUnitName) then
+        AUnitName:=NewUnitName;
+    end;
   end;
   //DebugLn('TCTDirectoryCache.FindUnitSourceInCompletePath RESULT AUnitName="',AUnitName,'" InFilename="',InFilename,'" Result=',Result);
 end;