Cache is good, but users will complain, I know

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge pull request #374 from emanuele45/small_cache_thing

Cache is good, but users will complain, I know