Further caching stuff + misc improvements
Added events to flush the cache