added cache, hope it's working... gonnna test tomorrow