Merge "BUG-1793: make sure we cache QNameModule"