Better caching between versions. (cherry picked from commit 30f845139d76762798e2cdec7804a38806c3eeca)