Added data caching and handling of individual items