I think Whizzer USA is out of stock on the gas caps, however you might want to check.
I know you can use the vintage cap on the new edition tanks, but the new edition cap is too deep for the vintage tanks [cuts into paint near the cap].
Dave at Whizzer told me sevveral years ago there is a cap that will fit, and I think it was for a Ford Bronco.
Have fun,