X2 and Y2 Caps

In 2018 I replaced a few X2 and Y2 caps in some of my 68K Macs.
At the time I could find Metallised Polypropylene X2 caps from Jaycar to replace the RIFA paper caps but had no luck locating non paper Y2 caps.
I ordered some paper Y2 caps from RS when they arrived some already had cracks in the outer casing. I found some that looked okay and used them.
I did this with two machines at the time but I have another 4 to do and would rather replace all the paper caps with something a little more modern.
Anyone have a source for Y2 caps?
Cheers,
At the time I could find Metallised Polypropylene X2 caps from Jaycar to replace the RIFA paper caps but had no luck locating non paper Y2 caps.
I ordered some paper Y2 caps from RS when they arrived some already had cracks in the outer casing. I found some that looked okay and used them.
I did this with two machines at the time but I have another 4 to do and would rather replace all the paper caps with something a little more modern.
Anyone have a source for Y2 caps?
Cheers,