Merge "Revert "PIC does not cache nulls by default"" into main