WIP/RFC for issue #328 (slow loading performance)