A system includes a signal source that provides a first signal for measuring a gas content of a liquid sample. The system also includes an analyzer that determines the gas content of the liquid sample using a measurement of a second signal, where the second signal is based on the first signal. The system further includes an apparatus with a walled structure having a cavity. The apparatus also includes a piston that pulls the liquid sample into the cavity and pushes the liquid sample out of the cavity. The apparatus further includes at least one measurement window having at least one inner surface exposed within the cavity. The at least one measurement window receives the first signal from the signal source and provides the second signal to the analyzer. The piston could also clean the at least one inner surface, and the piston can include a reference material for calibrating the analyzer.