Merge "Always save the cache if stuff was added to it - dont require deriving class...