Improved caching

 * Invalidate settings cache directly after insertion not kinda additional in a hook

Change-Id: Ie3cb9508ebd0614a74e5ef136584d27f6be3405e
Merge "Improved caching"