Merge "Adds cacheFlags parameter to cache/uncacheShortcuts() methods" into rvc-dev