Better permanent cache support