Start taking it apart now, grease everything. Might as well anti seize every spoke nipple. The front fender can be stopped breaking by large washers top and bottom of all four mounting bolts. Try as hard as I could, but the rear fender on my `16 does not break. I have tossed it quite hard, so mine must be defective. All this can be done while you are waiting for your new gas cap to show up. Throw the stock one away and get an aftermarket one made from billet aluminum. Beta screwed this up this year.