Added macros for larger caching