Allow some custom return types to be annotated as generic classes at runtime

Allow some custom return types to be annotated as generic classes at runtime #5270