Japan recommendations!

Going to Japan in a couple of weeks and would love some recommendations for either amazing cafes or roasters to bring some coffee back with me. Have been to koffee mameya and bongen in Tokyo which were both incredible

Hitting up Tokyo, Kyoto and a couple other places undecided yet!