A thermal-storage container used in a thermal-storage system to exchange heat by fluid flow though phase-changing material disposed inside the thermal-storage container, including a thermal-storage container housing, a fluid inlet and a fluid outlet, and one or more capsules containing the phase-change material, wherein the housing is shaped as an elongate container, a ratio of length to width of the housing is between 2 and 20. Related apparatus and methods are also described.