Merged
requested to merge 1548-replace-applicationlevelcache-with-hibernate-cache-for-queries into master
this required to store in database all information provided by API
this required to store in database all information provided by API