Need to invalidate caching before notifying of changes. Bug: 28621277 Change-Id: I2820b15d2364ecaad7666a820c0c7280ac6b7b4c