LGTM on the patch.
Just thinking whether it is capable or necessary to check clearCacheOnUiThread(false) ?