Caching

Merged some queries. Added Caching to Queries in Trimp class and in
calculation plugin