Single entity flush

The current `flush` behavior seems to be inconsistent or not well documented.