am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken