Extracted remote cache
refactorings