Add support for cache first sync