Revert "Recaching of DB images extended"

This reverts commit 59bde31a9c7fc7e4f94f1541bf4a8915567c7e4d.