UPD: fix cache problems
Merge pull request #107 from yupe/master

UPD: merge with yupe/master
Merge branch 'master' of github.com:angel-kulikov/yupe
UPD: fix cache core items
Merge pull request #1025 from angel-kulikov/master

UPD: small core cache fixes