Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread