Datasources caching and queueing fix