fix cache loading logic
Merge branch 'upstream/feature/selectable_http_tools' into feature/selectable_http_tools