Merge branch 'hotfix-0.1.10'
add check for existence in index when retreiving from cache
Merge branch 'hotfix-0.1.11' into next