More coverage, removed the mock cache class.