Solenoids, don´t often go bad. Might open it up and let the water out, maybe a coat of WD-40. Wash the outside of the starter off, real good. Mark the end cap, the case and front assembly, so it goes back together like it came apart.
Open up the back end of the starter, be careful not to back the aramture out to far. Wash the whole thing out with hot water, I use a solvent sprayer, with very hot water and a mild soap solution, then rinse. And blow it out with air.
A light coat of grease on the front shaft, a dab on the reduction gears, spray everything else, but the brushes and armature, with WD-40.
What usually goes wrong on the starter, is the brushes get worn down from sand and grit. The over running clutch fails or the Bendix (might be another name for it by Jeep) gets sticky from abrasion (sand and grit), or the reduction gears get jammed with grit.
There are usually some spacers (thrust washers) on the end of the shafts, that can become lost. Getting the reduction gears back together (if they fall out) can be a pain. Putting the end cap (brushes) back on, often requires some patience and a third hand. WD-40 leaves a light coating of wax, last longer than plain oil. A light coating of grease on the threads of the case bolts, will help with disassembly next time.
A small dab of loc tite on the starter mounting bolts, might help prevent, future problems (they come loose).
Nice to have the book around, while your doing the job. I´ve done it numerous times and always have the book handy, just in case.