Fixed caching callbacks