Re-enable cache which was disablled for testing