reverted stupid cleanup, caching works