Add test to ensure cache works
Merge branch '1.x'