Cleaning up the cache item APIs a little.