configurable through properties, fixed gridmessagesource
updates and introducing caching
Merge remote-tracking branch 'master/master'