Merge branch 'develop'
Added cache test.
Merge branch 'master' into develop