Cleanup of issues, simplified caching.