Removed caching decorators