diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index 250e4373d6..f1454105f0 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -5311,6 +5311,12 @@ var
         end else begin
           IsPredefined:=true;
         end;
+        if  (fodDoNotCache in SubParams.NewFlags) then begin
+          Include(Params.Flags, fdfDoNotCache);
+          Include(Params.NewFlags, fodDoNotCache);
+        end;
+        SubParams.AppendGenericParamValues(Params.GenParams);
+        Params.GenParams:=SubParams.GenParams;
         exit;
       end;