Added layered cache