Added a naive aggragate cache