cancanfix and caching fix