Final refactoring of Cache for Services and SR data