some cache improvements