Better encapsulate singleton TypeRepository, ValueHandlerImpl