Adding support for manual cached sync