Modified the check caching