Initial work on cache invalidsation refactoring