Bug/reporting cache

Fixes #37