Fixed error on cache function
Merge branch 'develop'