Merge "Fixing place where offset caches weren't being invalidated (issue 5608330)" into ics-mr1