Add test for removing cache and using instance store instead
Fix public cache bug