[BUGFIX][WORKAROUND] Skip IncludeCachedConfigurations

Change-Id: Ie4f861b19d02bcb18f486093afa0db69441e829a