Refactored code and added BodyDump for caching purpose!