Added some caching meta
Merge branch 'master' into persistentrefactor
Tags list primary refactor