Support generics for 1.18

[timtadh]

[timtadh]

Happy to support a contributor to get this landed as my time for FOSS has been limited over the last couple of years. Email me if you plan to work on this and we can setup a time to talk through any proposal you have.