(CAT-2327) Temporary revert of cache changes

Following an escalation on resource_api, other teams are experiencing
blockers due to changes made to cache behaviour in between 1.9.0 and
2.0.0. We are reverting any changes made in between those versions for
a quick release.

Author: LukasAud