What you can do to try and stop them rotating, which wears the cover holes oval, is put an O ring in the shaft hole before fitting the polished end cap, the steel pin with sealing O rings traps the extra O ring between shaft and pin to make shaft tight.
This is an idea from the US site which i have never bothered to try but they seem to be paranoid about wear in the holes.