Add rudimentary caching to speed things along