A battery is provided that includes a battery module, which includes cylindrical battery cells connected to each other in an electrically conductive manner. A temperature control system includes a container including a fluid space, into which container the battery cells partially protrude, and which includes an inflow and an outflow for a liquid of a liquid circuit. The liquid is an electrically non-conductive liquid, and the container includes a cell holder including openings, through which respective end sides of the battery cells of the battery module protrude into the fluid space of the container and which enclose respective outer surfaces of the battery cells in a liquid-tight manner. The cell holder includes a further opening, through which a contact element protrudes into the fluid space of the container and which surrounds an outer surface of the contact element in a liquid-tight manner.