Sounds good. Should I move both methods get/createAnnotationValidator to the factory?