Better 304 handling - fixes #11