Refactoring to support caching by aspect. Config commented out, as it's
broken...