Add names cache, return cleaned items...