Updated Service factory to return cached service instance