#17 cleanup and doc of caching