Skip optimised check when returning generic types

Skip optimised check when returning generic types #3383