Yes, the cap goes back on after filling. Also, note that every now and then, the Sapphire seems to produce very little vapor, even though it's got lots remaining, the battery is good, and the draw isn't clogged. You can fix this by popping off the mouthpiece, removing the blue plug, and then...