Retab/module caching

Retabbed with:

````
git checkout -b retab/module-caching --track limhoff-r7/feature/module-caching 
git merge master -s recursive -X ours -m "Merge master for retab"
tools/dev/retab.rb lib/
tools/dev/retab.rb modules/
commit -a -m "Retab module caching changes"
git push origin retab/module-caching 
git pr-url limhoff-r7 feature/module-caching
````

Let's see if this works out like you'd expect.