Added cache to MotisMapper instance.
Minor Changes.