Fixed tests falling behind cache API

Cache tests had a lot of dep warnings from the API changing.  Fixed tests to use newer API.