If you heard the old pump run and it was a Subaru pump, if you put in an aftermarket pump, I'd put the original Subaru pump back in when you fix the cap.
A little WD-40 on the fuel hoses on the pump plate will make them easier to get them on and off.