Small (caching) ENameProvider/QNameProvider changes