timob-17798: take care of other types of ResponseCache

Testing steps in JIRA.