Improved performance with better caching. Added workaround for bug in backend.