Fixing via cache issue, closes #378.