I have not had to deal with this situation but I have a CR123A here and just tested it in a 18650 case and it fits fine enough that you could use one. With them being short you could carry two where a single 18650 goes. They will rattle around a bit.
If you're looking to carry more, Illumn has these here.