Clean up of cache use for cypher compiler 2.1