Fix local cache store check.
Merge branch 'release/2.2' into develop