Fixing bugs in merge between pickle cache fix and documenting pickle caching.