issue-71: code changes after reviews

synced to ehcache/master and ready to be merged