8f9486c1ad
Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611' * commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611': Make sure we cache the sampleTable again if using the caching datasource.