Re-enabled canonical instance caching.