Upgrade CacheControl to 0.10.2

This fixes a reference cycle issue where pip would randomly hang
forever in some of the tests.
Merge pull request #1915 from dstufft/upgrade-cachecontrol

Upgrade CacheControl to 0.10.2
Clean up some no longer needed compatability code