Also the class could expect generic Class for Dialect to avoid unsafe casting.

This part cannot be fixed in a micro as the class is considered SPI. But we should fix it in 6 when we port this patch to 6.