Merge "Keep a cache of QName"