Attempts to deal gracefully with cache invalidation (ahaha. ha)
Merge pull request #1434 from CristinaRO/0.9.11-asdfkudos

Attempts to deal gracefully with cache invalidation (ahaha. ha)