Merge branch 'feature/module-cache-construction' into bug/slow-specs