Cache thing and fix #2