#120 reintroducing lost generics selection check and making sure  MapperCreationProcessor state is cleared.