Note - since it wasn't complete, I got rid of all caching stuff rather than trying to upgrade it.  If we want to add caching support, I suggest that we do a push to put in a full implementation.