Adding Cache! and some hotfix