Xpantastic!

Hi,
Yes, you are correct. That cap tends to fail.  I bought a hundred of them some time back, but have only had to replace 2 or 3 of them, over the years.  The part in your link should work fine. 
One thing you might consider, capacitors fail over time, so... Look for a cap with a high mtbf  (mean time before fail) rating. Just because it's my M12 I found the highest mtbf possible.Check digi-key.com
Best Luck
Karl