finish up the caching stuff