Merge pull request #32 from yurikuzn/fixes

Workarounds for upload restrictions and some fixes
use SugarCache