Proper data source w/ session caching