Test built in cache and replace deprecated collection wrapper