Added caching for items