Issue 354 - Avoid calling toUpperCase until we actually invoke the domain getter