Oil Filter Cap Question

Hi All,
Its time for my first oil change and I am thinking about getting rid of the plastic filter cap. I think this is the correct aluminum part for a V6 Gen 3 (I have a 2016 V6 SR5):

$21 Toyota Genuine Parts - Cap Assy, Oil Filter (15620-31060)

https://www.amazon.com/dp/B008BHP68A?ie=UTF8&psc=1

Is that correct? I ask because it was not 100 percent clear on some parts sites I looked at.

Is there anything else you need to get with this (i.e. will the drain plug from my current plastic cap fit on this?)?

I bought this thing to get the filter cap off:

https://store.snapon.com/Oil-Filter...xus-reg-Vehicles-Blue-Point-reg--P890277.aspx

Muchos gracias.

 

Thank you sir!