I had the same problem. I deviated a little from stock appearance and browsed through the plumbing area of Home Depot and found a soft rubber, beveled washer that works very well and provided a finished appearance. I forget what the exact application was. I can probably find out if you need me to.
PS - I deviated slightly on the cap too - it has a ribbed release button.
Dan