Water heating on demand