Skip version requirement on table upgrade
Indentation fixes, also add external caching object