diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e11ff78173b..eadf2100955 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-02  Joel Brobecker  <brobecker@adacore.com>
+
+	PR gdb/17856:
+	* ada-lang.c (ada_lookup_symbol_list_worker): Do not re-cache
+	results found in the cache.
+
 2015-02-02  Joel Brobecker  <brobecker@adacore.com>
 
 	PR gdb/17854:
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 921aed59575..562627ac970 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5412,14 +5412,12 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
   const struct block *block;
   const char *name;
   const int wild_match_p = should_use_wild_match (name0);
-  int cacheIfUnique;
+  int syms_from_global_search = 0;
   int ndefns;
 
   obstack_free (&symbol_list_obstack, NULL);
   obstack_init (&symbol_list_obstack);
 
-  cacheIfUnique = 0;
-
   /* Search specified block and its superiors.  */
 
   name = name0;
@@ -5463,7 +5461,6 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
      already performed this search before.  If we have, then return
      the same result.  */
 
-  cacheIfUnique = 1;
   if (lookup_cached_symbol (name0, namespace, &sym, &block))
     {
       if (sym != NULL)
@@ -5471,6 +5468,8 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
       goto done;
     }
 
+  syms_from_global_search = 1;
+
   /* Search symbols from all global blocks.  */
  
   add_nonlocal_symbols (&symbol_list_obstack, name, namespace, 1,
@@ -5489,10 +5488,10 @@ done:
 
   ndefns = remove_extra_symbols (*results, ndefns);
 
-  if (ndefns == 0 && full_search)
+  if (ndefns == 0 && full_search && syms_from_global_search)
     cache_symbol (name0, namespace, NULL, NULL);
 
-  if (ndefns == 1 && full_search && cacheIfUnique)
+  if (ndefns == 1 && full_search && syms_from_global_search)
     cache_symbol (name0, namespace, (*results)[0].sym, (*results)[0].block);
 
   ndefns = remove_irrelevant_renamings (*results, ndefns, block0);