The D25A mini holster works really well as storage for a 18650. You don’t want to push it all the way down though or you have to tap it out. 18650 is wider but not as long as the D25A, but there is a gripper in the bottom to hold it in place.
Just an idea!