Water doesn't go bad unless in plastic. All plastic 'leaks' toxins - that's why the CDC says to change out emergency water every 6 months. Proof in itself that BPA should be banned in the USA just like it is in other countries.
Ancient cistern in Jerusalem is rock
Check out "Hydration for the Apocalypse: How to Store Water for Long-Term Emergencies"
check out Bottle Royale on snopes for mythbusters.