Performance improvement for:

 - Bug #442237 - Provide utility means to verify which Validator
           is used

Signed-off-by: Marcel Valovy <marcel.valovy@oracle.com>