Use prefetch in onedatastore's onedatastore provider
Add acceptance tests