Fixed bug with mix caching (fixes #36)