Revert caching of callouts (broke `rake test`, non-trivial fix)