Initial work on cache implementation / refactoring