Fix a bug in caching where configuration update had no effect
Merge remote-tracking branch 'origin/feature/gpm' into feature/gpm