Air cooled lithium-ion battery with cylindrical cell in phase change material filled cavity of different shapes