experimental performance improvements
removed image caching