Return array for cached modules
Merge branch 'develop'