This is a follow up on HHH-10747 Resolved that fixes the same issue for the case of FIELD access.

It's not clear that is possible to have a fix for PROPERTY as well. The bytecode enhancer was designed for field attributes and everything else has always been 'best effort'. If such fix exists it will required changes on the bytecode enhancer, on the way collections are detected and also on the generated code.