I can always count on you to check up on my OCD (one of them anyway).
I've scrapped the plastic cups and moved on to a small trashcan-like container.
It doesn't look like it from the picture, but there are a lot of caps in there! I'll have to count them one of these days.