Made resolver calls thread-safe by using different objects