Merge "Fix and improve reference cache mod-union table"