Refactoring

* Got caching proxy for eprcentile mapper
* Revamping other mapeprs in collection mappers
* Modifying tests for other mappers to be collection mapper tests