ALM-213 fixed caching tests