Cache improvements, affects #18
Merge branch 'master' of github.com:DevGroup-ru/dotplant2