Adding more caching

Signed-off-by: Cade <me@cade.jp>