Upgraded to cheshire 5.1.0.