Adding really stupid caching

Add's really, really stupid caching. Should address issue #1 .