FIX: chaching bug with multiple instances
FIX: caching bug (using multiple instances)