Cleaning up the ISCache API a little and fleshing out the tests.