Idea on Gun Cleaning while waiting for matches

What if there was a quest from Mechanic that introduced the Gun Maintenance skill. Say, find 5-6 different guns FIR that are damaged, which if they are off scavs they will be, and then repair them and turn in.
Upon completion, Mechanic sells a newer type of WD-40 or cleaning solution to you that has like 8/8 uses. That way not only can you just, oh i repair gun now i shoot, we can also have an immersive option for having to sit and clean. Maybe the bonus is that the gun will actually go back to 100 durability or a 3hour period of the gun not taking the durability hit.