Added caching using the sqlite plugin
Merge
Forgot to include one file