If you have the room, try storing your water in a soft-sided cooler. It will also provide some protection against temperature swings as well.