Caching for DataSource2, plus some other improvements