Re-enable caching for testing
Reinstate caching dependencies