Anthony Martial isn't far from rediscovering his best goalscoring form and the competition from Edinson Cavani can act as a boost, says Manchester United boss Ole Gunnar Solskjaer.