With a long-lived cache instance, we need to allow re-adding elements
Fixing build when code is located in a subfolder with spaces