BUG-7996: reshuffle caching logic