Bug 855782 - Fix setting caching