added cache back in, cache for longer