Ya, we're currently working around this with an annotation processor that unrolls...
includedescriptorclasses does not keep type parameters