Whoops, missed a bit.

Fixed bug in caching; updated previously overlooked Error model