Cache it

Just slap in some caches