Disclosed is a cylinder assembly for a fluid-working machine. The assembly includes a body having a first end and a second end. The body further includes a cylinder, a poppet valve seat and a face-sealing annular valve seat. The cylinder is open to the first end and configured to receive a reciprocating piston. The poppet and annular valve seats extend around an axis through the cylinder. An annular valve including the annular valve seat and an annular valve member extends around the cylinder. Thus, the cylinder assembly is compact.