#3187: Fixed common name search not hitting cache; used Tony's changes