Clean-up...
Cleaning up when caching is allowed -- preserve old requirements for now...
...