Fixes for cache store