Dropped 2 more not needed indices
More correct implementation PsiShortNamesCache (although I do not know if it matters at all)