Trying quick caching fix, refactor to come