Use some caching on Prisms
Merge branch 'develop'