The 18650 fits nicely into a big cigar tube. My lights run on a variety of cells from cr123 to 17650 and 18650i just store my spare batts in a padded envelope in my bagAs long as it stays safe from bumps and knocks they are pretty reliableI've stored my batts this way for over 5 years in my bag and camping bags
This any good?http://www.ledfiretorches.co.uk/ultrafire-18650-cr123-battery-case.html