v1.3.1 + caching.