Delegate `klass` to the injected type object
Merge pull request #15205 from sgrif/sg-delegate-klass

Delegate `klass` to the injected type object