KCINFR-979: autowire generators

Cool, thanks Travis. Will merge