not sure if this will mesh
fixes to caching, removing printlns