Important fix to uniqueness of caching