Made the cache use superceding recency, removed old -Wshadow pragmas.