Update cache close test to account for final Cache type.
Spelling.
Account for the fact that one resize field may be zero for asepct resize.
Switch to OkHttp's MockWebServer.
Merge pull request #770 from square/jw/logic

FIX THINGS!