Modify OneToMany routing to support caching and one-to-one routing
Clean code
Map matcher stub