A suggestion and a question: Graphite will always remain in the lock and WD40 attracts dirt. From a locksmith website purchase Lok-shot. It is synthetic and supposedly does not attract dirt, it foams and actually crawls along a surface so it will reach places that you cannot directly spray it on. The ideal lock lubricant. Can I purchase the O-Ring on the gas cap (fifth gen)? I only see the entire assembly for sale online.