ALM-213 fixed tests for caching