Bug #22

Trying to debug cache issue on #22