Updated cache policy. Fixes #12