UPD: fix cache problems
Merge branch 'master' of github.com:angel-kulikov/yupe
UPD: fix cache core items